diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b82309064f2..7c7758e66ef 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-25  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* include/bits/random.h (random_device::min, max): Specify constexpr.
+
 2011-05-25  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/std/thread: Use noexcept throughout per the FDIS.
diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h
index f8f7ce9522e..f259f1563de 100644
--- a/libstdc++-v3/include/bits/random.h
+++ b/libstdc++-v3/include/bits/random.h
@@ -1544,12 +1544,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
 #endif
 
-    result_type
-    min() const
+    static constexpr result_type
+    min()
     { return std::numeric_limits<result_type>::min(); }
 
-    result_type
-    max() const
+    static constexpr result_type
+    max()
     { return std::numeric_limits<result_type>::max(); }
 
     double