diff --git a/devel/yaml-cpp/Makefile b/devel/yaml-cpp/Makefile
index b56b943ee40f..74e8dc945b51 100644
--- a/devel/yaml-cpp/Makefile
+++ b/devel/yaml-cpp/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	yaml-cpp
 PORTVERSION=	0.5.3
 DISTVERSIONPREFIX=	release-
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/devel/yaml-cpp/files/patch-include_yaml-cpp_emitter.h b/devel/yaml-cpp/files/patch-include_yaml-cpp_emitter.h
new file mode 100644
index 000000000000..2e7e09a71521
--- /dev/null
+++ b/devel/yaml-cpp/files/patch-include_yaml-cpp_emitter.h
@@ -0,0 +1,11 @@
+--- include/yaml-cpp/emitter.h.orig	2016-01-10 18:11:40 UTC
++++ include/yaml-cpp/emitter.h
+@@ -122,7 +122,7 @@ class YAML_CPP_API Emitter : private non
+   bool CanEmitNewline() const;
+ 
+  private:
+-  std::auto_ptr<EmitterState> m_pState;
++  std::unique_ptr<EmitterState> m_pState;
+   ostream_wrapper m_stream;
+ };
+ 
diff --git a/devel/yaml-cpp/files/patch-include_yaml-cpp_parser.h b/devel/yaml-cpp/files/patch-include_yaml-cpp_parser.h
new file mode 100644
index 000000000000..dd5ebd96e8aa
--- /dev/null
+++ b/devel/yaml-cpp/files/patch-include_yaml-cpp_parser.h
@@ -0,0 +1,13 @@
+--- include/yaml-cpp/parser.h.orig	2016-01-10 18:11:40 UTC
++++ include/yaml-cpp/parser.h
+@@ -40,8 +40,8 @@ class YAML_CPP_API Parser : private nonc
+   void HandleTagDirective(const Token& token);
+ 
+  private:
+-  std::auto_ptr<Scanner> m_pScanner;
+-  std::auto_ptr<Directives> m_pDirectives;
++  std::unique_ptr<Scanner> m_pScanner;
++  std::unique_ptr<Directives> m_pDirectives;
+ };
+ }
+