diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec
index e426cab..cad46d1 100644
--- a/gnome-shell-extensions.spec
+++ b/gnome-shell-extensions.spec
@@ -1,21 +1,15 @@
-#global commit g63dd27c
 %global pkg_prefix gnome-shell-extension
 
 Name:           gnome-shell-extensions
 Version:        3.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Modify and extend GNOME Shell functionality and behavior
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://live.gnome.org/GnomeShell/Extensions
 
 Source0:        http://ftp.gnome.org/pub/gnome/sources/gnome-shell-extensions/3.1/%{name}-%{version}.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 xrandr-indicator
@@ -33,9 +27,12 @@ Enabled extensions:
 
   * alternate-tab
   * alternative-status-menu
+  * apps-menu
   * auto-move-windows
   * dock
   * drive-menu
+# TODO: uncomment when enabling gajim
+#  * gajim
   * native-window-placement
   * places-menu
   * systemMonitor
@@ -44,6 +41,7 @@ Enabled extensions:
 # TODO: uncomment when enabling xrandr-indicator
 #  * xrandr-indicator
 
+
 %package -n %{pkg_prefix}-common
 Summary:        Files common to GNOME Shell Extensions
 Group:          User Interface/Desktops
@@ -56,6 +54,7 @@ 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.
 
+
 %package -n %{pkg_prefix}-alternate-tab
 Summary:        Classic Alt+Tab behavior. Window based instead of app based
 Group:          User Interface/Desktops
@@ -69,6 +68,7 @@ Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.
 GNOME Shell groups multiple instances of the same application together. 
 This extension disables grouping.  
 
+
 %package -n %{pkg_prefix}-alternative-status-menu
 Summary:        For those who want a power off item visible at all the time
 Group:          User Interface/Desktops
@@ -82,6 +82,17 @@ For those who want a power off item visible at all the time, replaces
 GNOME Shell status menu with one featuring separate Suspend and Power Off. 
 Adds the ability to hibernate as well.
 
+
+%package -n %{pkg_prefix}-apps-menu
+Summary:        Application menu for GNOME Shell
+Group:          User Interface/Desktops
+License:        GPLv2+
+Requires:       %{pkg_prefix}-common = %{version}-%{release}
+
+%description  -n %{pkg_prefix}-apps-menu
+Add a GNOME 2.x style menu for applications.
+
+
 %package -n %{pkg_prefix}-auto-move-windows
 Summary:        Assign specific workspaces to applications
 Group:          User Interface/Desktops
@@ -95,6 +106,7 @@ Lets you manage your workspaces more easily, assigning a specific workspace to
 each application as soon as it creates a window, in a manner configurable with a
 GSettings key.
 
+
 %package -n %{pkg_prefix}-dock
 Summary:        Shows a dock-style task switcher permanently
 Group:          User Interface/Desktops
@@ -106,6 +118,7 @@ Requires:       %{pkg_prefix}-common = %{version}-%{release}
 %description -n %{pkg_prefix}-dock
 Shows a dock-style task switcher on the right side of the screen permanently.
 
+
 %package -n %{pkg_prefix}-drive-menu
 Summary:        Disk device manager in the system status area
 Group:          User Interface/Desktops
@@ -118,6 +131,19 @@ Requires:       %{pkg_prefix}-common = %{version}-%{release}
 Adds a menu in the system status area that tracks removable disk devices
 attached and offers to browse them and eject/unmount them.
 
+
+# TODO: uncomment when enabling gajim
+# %package -n %{pkg_prefix}-gajim
+# Summary:        Gajim IM integration
+# Group:          User Interface/Desktops
+# License:        GPLv2+
+# Requires:       %{pkg_prefix}-common = %{version}-%{release}
+# Requires:       gajim
+
+# %description  -n %{pkg_prefix}-gajim
+# Display Gajim incoming chats as notifications in the Shell message tray.
+
+
 %package -n %{pkg_prefix}-native-window-placement
 Summary:        Arrange windows in overview in a more native way
 Group:          User Interface/Desktops
@@ -131,6 +157,7 @@ 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.
 
+
 %package -n %{pkg_prefix}-places-menu
 Summary:        Places menu indicator in the system status area
 Group:          User Interface/Desktops
@@ -143,6 +170,7 @@ Requires:       %{pkg_prefix}-common = %{version}-%{release}
 Adds a menu in the system status area that resembles the Places menu from
 GNOME 2.x
 
+
 %package -n %{pkg_prefix}-systemMonitor
 Summary:        Monitor your system status
 Group:          User Interface/Desktops
@@ -155,6 +183,7 @@ Requires:	libgtop2
 %description -n %{pkg_prefix}-systemMonitor
 Monitor your system status
 
+
 %package -n %{pkg_prefix}-user-theme
 Summary:        Lets the user select a custom theme for the shell
 Group:          User Interface/Desktops
@@ -167,6 +196,7 @@ Requires:       %{pkg_prefix}-common = %{version}-%{release}
 Lets the user select a custom theme for the Gnome shell. It will allow you to 
 apply a style from /.themes/[themeName]/gnome-shell/gnome-shell.css
 
+
 %package -n %{pkg_prefix}-windowsNavigator
 Summary:        Keyboard selection of windows and work-spaces in overlay mode
 Group:          User Interface/Desktops
@@ -181,6 +211,7 @@ GNOME Shell.  Switch to overview mode (press the windows or alt+f1 key) and
 press the alt key to show numbers over windows.  Press any number to switch
 to the corresponding window.
 
+
 # TODO: uncomment when enabling xrandr-indicator
 #%package -n %{pkg_prefix}-xrandr-indicator
 #Summary:        Monitor status indicator
@@ -195,12 +226,6 @@ to the corresponding window.
 %prep
 %setup -q
 
-# 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
@@ -211,98 +236,132 @@ to the corresponding window.
 %configure  --enable-extensions="alternate-tab alternative-status-menu auto-move-windows dock drive-menu native-window-placement places-menu systemMonitor user-theme windowsNavigator"
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
+
 %files -n %{pkg_prefix}-common -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README
 %dir %{_datadir}/gnome-shell/extensions/
 
+
 %files -n %{pkg_prefix}-alternate-tab
 %defattr(-,root,root,-)
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.alternate-tab.gschema.xml
 %{_datadir}/gnome-shell/extensions/alternate-tab*
 
+
 %files -n %{pkg_prefix}-alternative-status-menu
 %defattr(-,root,root,-)
 %{_datadir}/gnome-shell/extensions/alternative-status-menu*
 
+
+%files -n %{pkg_prefix}-apps-menu
+%defattr(-,root,root,-)
+%{_datadir}/gnome-shell/extensions/apps-menu*
+
+
 %files -n %{pkg_prefix}-auto-move-windows
 %defattr(-,root,root,-)
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.auto-move-windows.gschema.xml
 %{_datadir}/gnome-shell/extensions/auto-move-windows*
 
+
 %files -n %{pkg_prefix}-dock
 %defattr(-,root,root,-)
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.dock.gschema.xml
 %{_datadir}/gnome-shell/extensions/dock*
 
+
 %files -n %{pkg_prefix}-drive-menu
 %defattr(-,root,root,-)
 %{_datadir}/gnome-shell/extensions/drive-menu*
 
+
+# TODO: uncomment when enabling gajim
+# %files -n %{pkg_prefix}-gajim
+# %defattr(-,root,root,-)
+# %{_datadir}/gnome-shell/extensions/gajim*
+
+
 %files -n %{pkg_prefix}-native-window-placement
 %defattr(-,root,root,-)
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.native-window-placement.gschema.xml
 %{_datadir}/gnome-shell/extensions/native-window-placement*
 
+
 %files -n %{pkg_prefix}-places-menu
 %defattr(-,root,root,-)
 %{_datadir}/gnome-shell/extensions/places-menu*
 
+
 %files -n %{pkg_prefix}-systemMonitor
 %defattr(-,root,root,-)
 %{_datadir}/gnome-shell/extensions/systemMonitor*
 
+
 %files -n %{pkg_prefix}-user-theme
 %defattr(-,root,root,-)
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.user-theme.gschema.xml
 %{_datadir}/gnome-shell/extensions/user-theme*
 
+
 %files -n %{pkg_prefix}-windowsNavigator
 %defattr(-,root,root,-)
 %{_datadir}/gnome-shell/extensions/windowsNavigator*
 
+
 # TODO: uncomment when enabling xrandr-indicator
 #%files -n %{pkg_prefix}-xrandr-indicator
 #%defattr(-,root,root,-)
 #%{_datadir}/gnome-shell/extensions/xrandr-indicator*
 
+
 %posttrans -n %{pkg_prefix}-alternate-tab
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
 %postun -n %{pkg_prefix}-alternate-tab
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
+
 %posttrans -n %{pkg_prefix}-auto-move-windows
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
 %postun -n %{pkg_prefix}-auto-move-windows
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
+
 %posttrans -n %{pkg_prefix}-dock
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
 %postun -n %{pkg_prefix}-dock
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
+
 %posttrans -n %{pkg_prefix}-native-window-placement
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
 %postun -n %{pkg_prefix}-native-window-placement
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
+
 %posttrans -n %{pkg_prefix}-user-theme
 glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas || :
 
 %postun -n %{pkg_prefix}-user-theme
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
+
 %changelog
+* Sun Aug 21 2011 Michel Salim <salimma@fedoraproject.org> - 3.1.4-2
+- Enable apps-menu extension
+- Spec cleanup
+
 * Sun Aug 21 2011 Michel Salim <salimma@fedoraproject.org> - 3.1.4-1
 - Update to 3.1.4
 - Enable systemMonitor extension