diff --git a/.gitignore b/.gitignore
index 424cb45..e6bd4fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /gnome-shell-extensions-6d56cf.tar.xz
 /gnome-shell-extensions-f016b9.tar.xz
 /gnome-shell-extensions-03660f.tar.xz
+/gnome-shell-extensions-g63dd27c.tar.xz
diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec
index 3e5e5f3..28f26f8 100644
--- a/gnome-shell-extensions.spec
+++ b/gnome-shell-extensions.spec
@@ -1,21 +1,24 @@
-%global commit 03660f
+%global commit g63dd27c
 
 Name:           gnome-shell-extensions
-Version:        3.0.1
-Release:        3.%{commit}git%{?dist}
+Version:        3.0.2
+Release:        1.%{commit}git%{?dist}
 Summary:        Modify and extend GNOME Shell functionality and behavior
 Group:          User Interface/Desktops
 License:        GPLv2+ 
 URL:            http://live.gnome.org/GnomeShell/Extensions
 
-#  using git archive since upstream hasn't created tarballs.  Picking up a post 3.0.0 release snapshot for a couple of minor but relevant changes
-#  git archive --format=tar --prefix=gnome-shell-extensions/ git_commithash  | xz  > gnome-shell-extensions-<git_commithash_abbr>.tar.xz
+#  using git archive since upstream hasn't created tarballs.  Picking up a snapshot from master for a couple of minor but relevant changes
+#  git archive --format=tar --prefix=gnome-shell-extensions/ git_commithash | xz > gnome-shell-extensions-<git_commithash_abbr>.tar.xz
 Source0:        gnome-shell-extensions-%{commit}.tar.xz
 
 # since we build from a git checkout
 BuildRequires:  gnome-common
 BuildRequires:  intltool
 BuildRequires:  glib2-devel
+# TODO: uncomment when enabling systemMonitor
+#BuildRequires:  pkgconfig(libgtop-2.0)
+
 Requires:       gnome-shell >= 3.0.1
 BuildArch:      noarch
 
@@ -34,6 +37,8 @@ Enabled extensions:
   * drive-menu
   * places-menu
   * native-window-placement
+# TODO: uncomment when enabling systemMonitor
+#  * systemMonitor
 
 %package        common
 Summary:        Files common to GNOME Shell Extensions
@@ -42,7 +47,7 @@ License:        GPLv2+
 %description    common
 GNOME Shell Extensions is a collection of extensions providing additional 
 and optional functionality to GNOME Shell. Common files and directories 
-needed by extensions are provided here. 
+needed by extensions are provided here.
 
 %package        alternate-tab
 Summary:        Classic Alt+Tab behavior. Window based instead of app based
@@ -139,12 +144,25 @@ This extension employs an algorithm (taken from KDE) for layouting the
 thumbnails in the overview that more closely reflects the positions and relative
 sizes of the actual windows, instead of using a fixed grid.
 
+# TODO: uncomment when enabling systemMonitor
+#%package        systemMonitor
+#Summary:        Monitor your system status
+#Group:          User Interface/Desktops
+#License:        GPLv2+ 
+#Requires:       %{name}-common = %{version}-%{release}
+#
+#%description    systemMonitor
+#Monitor your system status
+
 %prep
 %setup -q -n gnome-shell-extensions
 
 # Main.panel._userMenu renamed to Main.panel._statusmenu in GS 3.0.1; fix sent
 # to the alternative-status-menu extension author
 sed -i "s|Main\.panel\._userMenu|Main.panel._statusmenu|g" extensions/alternative-status-menu/extension.js
+# The configure.ac still thinks that 3.0.1 is the newest version; changing it to 3.0 will make it work
+# with any 3.0.x release
+sed -i "s|3.0.1|3.0|g" configure.ac
 
 %build
 # since we build from a git checkout
@@ -176,6 +194,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %files dock
 %defattr(-,root,root,-)
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.dock.gschema.xml
 %{_datadir}/gnome-shell/extensions/dock*
 
 %files windowsNavigator
@@ -214,6 +233,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.native-window-placement.gschema.xml
 %{_datadir}/gnome-shell/extensions/native-window-placement*
 
+# TODO: uncomment when enabling systemMonitor
+#%files systemMonitor
+#%defattr(-,root,root,-)
+#%{_datadir}/gnome-shell/extensions/systemMonitor*
+
 %posttrans user-theme
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
@@ -232,7 +256,18 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 %postun native-window-placement
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
+%posttrans dock
+glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
+
+%postun dock
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
 %changelog
+* Sat May 28 2011 Timur Kristóf <venemo@fedoraproject.org> - 3.0.2-1.g63dd27cgit
+- Update to a newer git snapshot
+- Fix RHBZ bug #708230
+- Enabled systemMonitor extension, but commented out since the requirements are not available
+
 * Fri May 13 2011 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.0.1-3.03660fgit
 - Update to a newer git snapshot
 - Enable native-window-placement extension
diff --git a/sources b/sources
index 7814c45..02beabb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c2cbfce26c4da19f08f870b55f995d64  gnome-shell-extensions-03660f.tar.xz
+976e00599ca3c68aaabdf71adf09a52c  gnome-shell-extensions-g63dd27c.tar.xz