diff --git a/gnome-shell-extensions.changes b/gnome-shell-extensions.changes
index 6d91e5b..e0a15ba 100644
--- a/gnome-shell-extensions.changes
+++ b/gnome-shell-extensions.changes
@@ -6,7 +6,8 @@ Tue May 24 11:36:07 CEST 2011 - dimstar@opensuse.org
   + bgo#647599: support globally installed themes
   + Added license and README
   + Updated translations.
-- Disable drive menu extension for now. It's not part of 3.0.x.
+- Disable drive menu extension for now, with a %build_drive_menu
+  macro. It was in git, but is not part of the 3.0.x tarballs.
 
 -------------------------------------------------------------------
 Sat Apr 30 15:42:10 UTC 2011 - malcolmlewis@opensuse.org
diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec
index 9529f64..103a89d 100644
--- a/gnome-shell-extensions.spec
+++ b/gnome-shell-extensions.spec
@@ -16,14 +16,12 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# Drive Menu does not really exist in the 3.0.x tree. It's supposedly comming with 3.1.x
-%define drive_menu 0
+# Drive Menu does not exist in the 3.0.x tree. It's supposedly comming with 3.1.x
+%define build_drive_menu 0
 
 Name:           gnome-shell-extensions
 Version:        3.0.2
 Release:        1
-# git show-ref HEAD
-# f016b95f772f7ca3947ecee7dc2cea55a15e5138 refs/remotes/origin/HEAD
 License:        GPLv2+
 Summary:        A collection of extensions for GNOME Shell
 Url:            http://live.gnome.org/GnomeShell/Extensions
@@ -40,7 +38,9 @@ Recommends:     gnome-shell-extension-alt-status-menu
 Recommends:     gnome-shell-extension-alternate-tab
 Recommends:     gnome-shell-extension-auto-move-windows
 Recommends:     gnome-shell-extension-dock
+%if 0%{?build_drive_menu}
 Recommends:     gnome-shell-extension-drive-menu
+%endif
 Recommends:     gnome-shell-extension-gajim
 Recommends:     gnome-shell-extension-user-theme
 Recommends:     gnome-shell-extension-windows-navigator
@@ -188,46 +188,55 @@ rm -r %{buildroot}%{_datadir}/gnome-shell/extensions/example@gnome-shell-extensi
 
 %files
 %defattr(-,root,root)
-%doc README README.SUSE COPYING
+%doc COPYING README README.SUSE
 
 %files -n gnome-shell-extension-alt-status-menu
 %defattr(-,root,root)
+%doc COPYING
 %{_datadir}/gnome-shell/extensions/alternative-status-menu@gnome-shell-extensions.gnome.org/
 
 %files -n gnome-shell-extension-alternate-tab
 %defattr(-,root,root)
+%doc COPYING
 %{_datadir}/gnome-shell/extensions/alternate-tab@gnome-shell-extensions.gnome.org/
 
 %files -n gnome-shell-extension-auto-move-windows
 %defattr(-,root,root)
+%doc COPYING
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.auto-move-windows.gschema.xml
 %{_datadir}/gnome-shell/extensions/auto-move-windows@gnome-shell-extensions.gnome.org/
 
 %files -n gnome-shell-extension-dock
 %defattr(-,root,root)
+%doc COPYING
 %{_datadir}/gnome-shell/extensions/dock@gnome-shell-extensions.gnome.org/
 
-%if 0%{?drive_menu}
+%if 0%{?build_drive_menu}
 %files -n gnome-shell-extension-drive-menu
 %defattr(-,root,root)
+%doc COPYING
 %{_datadir}/gnome-shell/extensions/drive-menu@gnome-shell-extensions.gnome.org/
 %endif
 
 %files -n gnome-shell-extension-gajim
 %defattr(-,root,root)
+%doc COPYING
 %{_datadir}/gnome-shell/extensions/gajim@gnome-shell-extensions.gnome.org/
 
 %files -n gnome-shell-extension-user-theme
 %defattr(-,root,root)
+%doc COPYING
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.user-theme.gschema.xml
 %{_datadir}/gnome-shell/extensions/user-theme@gnome-shell-extensions.gnome.org/
 
 %files -n gnome-shell-extension-windows-navigator
 %defattr(-,root,root)
+%doc COPYING
 %{_datadir}/gnome-shell/extensions/windowsNavigator@gnome-shell-extensions.gnome.org/
 
 %files -n gnome-shell-extension-xrandr-indicator
 %defattr(-,root,root)
+%doc COPYING
 %{_datadir}/gnome-shell/extensions/xrandr-indicator@gnome-shell-extensions.gnome.org/
 
 %files lang -f %{name}.lang