diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 96f9cea273901aae8200e286ec571888124bcf83..80f588d15beb6bdaa773e94fc33cf1d94718c762 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-04  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/27601
+	* c-common.c (fold_offsetof_1): Handle static members.
+
 2006-06-04 Eric Christopher <echristo@apple.com>
 
 	* stor-layout.c (start_record_layout): Initialize remaining_in_alignment.
diff --git a/gcc/c-common.c b/gcc/c-common.c
index dea83894e7f21f1e9c279eec71a22240ff4d43e3..1fb5a6a4a4b8287009c0ce0f5b1d7ccbf98d6ba5 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -5981,6 +5981,10 @@ fold_offsetof_1 (tree expr)
     case ERROR_MARK:
       return expr;
 
+    case VAR_DECL:
+      error ("cannot apply %<offsetof%> to static data member %qD", expr);
+      return error_mark_node;
+
     case INDIRECT_REF:
       return size_zero_node;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 43d0d6624af2a2bf85f979f68bc26e713ccc62c9..9b484a9a363ffa6279a8bd0b050c0f2e4bb6f135 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-04  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/27601
+	* g++.dg/ext/offsetof1.C: New test.
+
 2006-06-04 Eric Christopher <echristo@apple.com>
 
 	* gcc.dg/attr-ms_struct-1.c: New.
diff --git a/gcc/testsuite/g++.dg/ext/offsetof1.C b/gcc/testsuite/g++.dg/ext/offsetof1.C
new file mode 100644
index 0000000000000000000000000000000000000000..5d6552f78787215971f7fc9a975e689786a5395d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/offsetof1.C
@@ -0,0 +1,9 @@
+// PR c++/27601
+// Origin: Patrik Hägglund  <patrik.hagglund@bredband.net>
+// { dg-do compile }
+
+struct bar {
+  static int foo;
+};
+
+int a = __builtin_offsetof(bar, foo);  // { dg-error "static data member" }