diff --git a/include/boost/config/platform/hpux.hpp b/include/boost/config/platform/hpux.hpp
index fd9102e4..25cd8ebc 100644
--- a/include/boost/config/platform/hpux.hpp
+++ b/include/boost/config/platform/hpux.hpp
@@ -2,7 +2,7 @@
 //  (C) Copyright Jens Maurer 2001 - 2003. 
 //  (C) Copyright David Abrahams 2002. 
 //  (C) Copyright Toon Knapen 2003. 
-//  (C) Copyright Boris Gubenko 2006.
+//  (C) Copyright Boris Gubenko 2006 - 2007.
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -36,7 +36,6 @@
 #     define BOOST_HAS_PTHREADS
 #  endif
 #elif defined(__HP_aCC) && !defined(BOOST_DISABLE_THREADS)
-//#  define BOOST_HAS_THREADS
 #  define BOOST_HAS_PTHREADS
 #endif
 
@@ -73,7 +72,9 @@
 #  define BOOST_HAS_SIGACTION
 #endif
 #ifndef BOOST_HAS_NRVO 
-#  define BOOST_HAS_NRVO
+#  ifndef __parisc
+#    define BOOST_HAS_NRVO
+#  endif
 #endif
 #ifndef BOOST_HAS_LOG1P 
 #  define BOOST_HAS_LOG1P
@@ -81,5 +82,3 @@
 #ifndef BOOST_HAS_EXPM1
 #  define BOOST_HAS_EXPM1
 #endif
-
-