diff --git a/include/boost/smart_ptr/allocation_ptr.hpp b/include/boost/smart_ptr/allocation_ptr.hpp
index 6cf5d51..f6a1683 100644
--- a/include/boost/smart_ptr/allocation_ptr.hpp
+++ b/include/boost/smart_ptr/allocation_ptr.hpp
@@ -10,6 +10,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
+#include <boost/type_traits/remove_cv.hpp>
 #include <boost/assert.hpp>
 #if !defined(BOOST_NO_CXX11_ALLOCATOR)
 #include <memory>
@@ -18,15 +19,19 @@ Distributed under the Boost Software License, Version 1.0.
 namespace boost {
 namespace detail {
 
+#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class T, class A>
 struct sp_allocation_ptr {
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
     typedef typename std::allocator_traits<A>::template
-        rebind_traits<T>::pointer type;
-#else
-    typedef typename A::template rebind<T>::other::pointer type;
-#endif
+        rebind_traits<typename boost::remove_cv<T>::type>::pointer type;
 };
+#else
+template<class T, class A>
+struct sp_allocation_ptr {
+    typedef typename A::template
+        rebind<typename boost::remove_cv<T>::type>::other::pointer type;
+};
+#endif
 
 } /* detail */
 
diff --git a/test/allocation_ptr_test.cpp b/test/allocation_ptr_test.cpp
index 5218484..cf21d7c 100644
--- a/test/allocation_ptr_test.cpp
+++ b/test/allocation_ptr_test.cpp
@@ -17,18 +17,36 @@ void test_pointer(scalar)
 {
     BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<int,
         boost::default_allocator<void> >::pointer, int*);
+    BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<const int,
+        boost::default_allocator<void> >::pointer, int*);
+    BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<const volatile int,
+        boost::default_allocator<void> >::pointer, int*);
+    BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<volatile int,
+        boost::default_allocator<void> >::pointer, int*);
 }
 
 void test_pointer(unbounded_array)
 {
     BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<int[],
         boost::default_allocator<void> >::pointer, int*);
+    BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<const int[],
+        boost::default_allocator<void> >::pointer, int*);
+    BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<const volatile int[],
+        boost::default_allocator<void> >::pointer, int*);
+    BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<volatile int[],
+        boost::default_allocator<void> >::pointer, int*);
 }
 
 void test_pointer(bounded_array)
 {
     BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<int[5],
         boost::default_allocator<void> >::pointer, int*);
+    BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<const int[5],
+        boost::default_allocator<void> >::pointer, int*);
+    BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<const volatile int[5],
+        boost::default_allocator<void> >::pointer, int*);
+    BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<volatile int[5],
+        boost::default_allocator<void> >::pointer, int*);
 }
 
 void test_element_type(scalar)