diff --git a/Source/cm_auto_ptr.hxx b/Source/cm_auto_ptr.hxx
index f6c43624f8..f38eda5ab4 100644
--- a/Source/cm_auto_ptr.hxx
+++ b/Source/cm_auto_ptr.hxx
@@ -14,7 +14,13 @@
 
 #include <cmConfigure.h>
 
-// FIXME: Use std::auto_ptr on compilers that do not warn about it.
+#ifdef CMake_HAVE_CXX_AUTO_PTR
+
+#include <memory>
+#define CM_AUTO_PTR std::auto_ptr
+
+#else
+
 #define CM_AUTO_PTR cm::auto_ptr
 
 // The HP compiler cannot handle the conversions necessary to use
@@ -219,3 +225,5 @@ public:
 #endif
 
 #endif
+
+#endif