diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec
index 37695fd..58ea6ac 100644
--- a/gnome-shell-extensions.spec
+++ b/gnome-shell-extensions.spec
@@ -5,7 +5,7 @@
 Name:           gnome-shell-extensions
 Version:        3.1.91
 #Release:        3.%{checkout}%{?dist}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Modify and extend GNOME Shell functionality and behavior
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -21,13 +21,10 @@ Source0:        %{name}-%{version}.tar.xz
 
 # Since we build from a git checkout
 BuildRequires:  gnome-common
-
 BuildRequires:  intltool
 BuildRequires:  glib2-devel
-# TODO: uncomment when enabling xrandr-indicator
-# BuildRequires:  pkgconfig(gnome-desktop-3.0)
+BuildRequires:  pkgconfig(gnome-desktop-3.0)
 BuildRequires:  pkgconfig(libgtop-2.0)
-
 Requires:       gnome-shell >= 3.1.91
 BuildArch:      noarch
 
@@ -48,10 +45,10 @@ Enabled extensions:
   * systemMonitor
   * user-theme
   * windowsNavigator
+  * workspace-indicator
+  * xrandr-indicator
 # TODO: uncomment when enabling gajim
 #  * gajim
-# TODO: uncomment when enabling xrandr-indicator
-#  * xrandr-indicator
 
 
 %package -n %{pkg_prefix}-common
@@ -224,16 +221,27 @@ 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
-#Group:          User Interface/Desktops
-#License:        GPLv2+
-#Requires:       %{pkg_prefix}-common = %{version}-%{release}
-#
-#%description  -n %{pkg_prefix}-xrandr-indicator
-#This extension adds a systems status menu for rotating monitors
-#(overrides what is currently provided by gnome-settings-daemon.
+%package -n %{pkg_prefix}-workspace-indicator
+Summary:        Workspace Indicator
+Group:          User Interface/Desktops
+License:        GPLv2+
+Requires:       %{pkg_prefix}-common = %{version}-%{release}
+
+%description -n %{pkg_prefix}-workspace-indicator
+Put an indicator on the panel signaling in which workspace you are, and give you
+the possibility of switching to another one.
+
+
+%package -n %{pkg_prefix}-xrandr-indicator
+Summary:        Monitor status indicator
+Group:          User Interface/Desktops
+License:        GPLv2+
+Requires:       %{pkg_prefix}-common = %{version}-%{release}
+
+%description  -n %{pkg_prefix}-xrandr-indicator
+This extension adds a systems status menu for rotating monitors
+(overrides what is currently provided by gnome-settings-daemon.
+
 
 %prep
 %setup -q
@@ -245,9 +253,7 @@ to the corresponding window.
 # since we build from a git checkout
 [ -x autogen.sh ] && NOCONFIGURE=1 ./autogen.sh 
 
-# TODO: enable xrandr-indicator extension when:
-# - gjs 1.29.16 is supported (upper limit is now 1.29.1)
-%configure  --enable-extensions="alternate-tab alternative-status-menu apps-menu auto-move-windows dock drive-menu native-window-placement places-menu systemMonitor user-theme windowsNavigator"
+%configure  --enable-extensions="alternate-tab alternative-status-menu apps-menu auto-move-windows dock drive-menu native-window-placement places-menu systemMonitor user-theme windowsNavigator workspace-indicator xrandr-indicator"
 make %{?_smp_mflags}
 
 
@@ -330,10 +336,14 @@ make install DESTDIR=$RPM_BUILD_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*
+%files -n %{pkg_prefix}-workspace-indicator
+%defattr(-,root,root,-)
+%{_datadir}/gnome-shell/extensions/workspace-indicator*
+
+
+%files -n %{pkg_prefix}-xrandr-indicator
+%defattr(-,root,root,-)
+%{_datadir}/gnome-shell/extensions/xrandr-indicator*
 
 
 %posttrans -n %{pkg_prefix}-alternate-tab
@@ -372,6 +382,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Wed Sep 14 2011 Mohamed El Morabity <melmorabity@fedorapeople.org> - 3.1.91-2
+- Enable xrandr-indicator and workspace-indicator extensions
+
 * Mon Sep 12 2011 Michel Salim <salimma@fedoraproject.org> - 3.1.91-1
 - Update to 3.1.91
 - add more documentation