diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 86e9d4cfbfef22d144ac61331c5f38029adfb108..0f45d80d9680f2a345ff12567ef31873b9f603ba 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-13  John Marino  <gnugcc@marino.st>
+
+	* config/os/bsd/dragonfly/os_defines.h (_GLIBCXX_USE_C99_CHECK,
+	_GLIBCXX_USE_C99_DYNAMIC, _GLIBCXX_USE_C99_LONG_LONG_CHECK,
+	_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC): Define.
+
 2015-07-05  François Dumont  <fdumont@gcc.gnu.org>
 
 	* include/bits/hashtable.h (_Hashtable<>::__rehash_policy): Do not
diff --git a/libstdc++-v3/config/os/bsd/dragonfly/os_defines.h b/libstdc++-v3/config/os/bsd/dragonfly/os_defines.h
index d7c3d8841f36d31e8a20bbb8984a6fb020e53578..5e11c451ec2ced13e165466c1fc2e56580c4d472 100644
--- a/libstdc++-v3/config/os/bsd/dragonfly/os_defines.h
+++ b/libstdc++-v3/config/os/bsd/dragonfly/os_defines.h
@@ -29,4 +29,9 @@
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
 
+#define _GLIBCXX_USE_C99_CHECK 1
+#define _GLIBCXX_USE_C99_DYNAMIC (!(__ISO_C_VISIBLE >= 1999))
+#define _GLIBCXX_USE_C99_LONG_LONG_CHECK 1
+#define _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC (_GLIBCXX_USE_C99_DYNAMIC || !defined __LONG_LONG_SUPPORTED)
+
 #endif