diff --git a/gedit-plugins-disable-python3.patch b/gedit-plugins-disable-python3.patch
new file mode 100644
index 0000000..cf7e104
--- /dev/null
+++ b/gedit-plugins-disable-python3.patch
@@ -0,0 +1,234 @@
+--- gedit-plugins-3.8.1/plugins/bracketcompletion/bracketcompletion.plugin.desktop.in
++++ gedit-plugins-3.8.1/plugins/bracketcompletion/bracketcompletion.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=bracketcompletion
+ IAge=3
+ _Name=Bracket Completion
+--- gedit-plugins-3.8.1/plugins/bracketcompletion/bracketcompletion.plugin.desktop.in.in
++++ gedit-plugins-3.8.1/plugins/bracketcompletion/bracketcompletion.plugin.desktop.in.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=bracketcompletion
+ IAge=3
+ _Name=Bracket Completion
+--- gedit-plugins-3.8.1/plugins/charmap/charmap.plugin.desktop.in
++++ gedit-plugins-3.8.1/plugins/charmap/charmap.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=charmap
+ IAge=3
+ _Name=Character Map
+--- gedit-plugins-3.8.1/plugins/charmap/charmap.plugin.desktop.in.in
++++ gedit-plugins-3.8.1/plugins/charmap/charmap.plugin.desktop.in.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=charmap
+ IAge=3
+ _Name=Character Map
+--- gedit-plugins-3.8.1/plugins/codecomment/codecomment.plugin.desktop.in
++++ gedit-plugins-3.8.1/plugins/codecomment/codecomment.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=codecomment
+ IAge=3
+ _Name=Code comment
+--- gedit-plugins-3.8.1/plugins/codecomment/codecomment.plugin.desktop.in.in
++++ gedit-plugins-3.8.1/plugins/codecomment/codecomment.plugin.desktop.in.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=codecomment
+ IAge=3
+ _Name=Code comment
+--- gedit-plugins-3.8.1/plugins/colorpicker/colorpicker.plugin.desktop.in
++++ gedit-plugins-3.8.1/plugins/colorpicker/colorpicker.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=colorpicker
+ IAge=3
+ _Name=Color Picker
+--- gedit-plugins-3.8.1/plugins/colorpicker/colorpicker.plugin.desktop.in.in
++++ gedit-plugins-3.8.1/plugins/colorpicker/colorpicker.plugin.desktop.in.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=colorpicker
+ IAge=3
+ _Name=Color Picker
+--- gedit-plugins-3.8.1/plugins/colorschemer/colorschemer.plugin.desktop.in
++++ gedit-plugins-3.8.1/plugins/colorschemer/colorschemer.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=colorschemer
+ IAge=3
+ _Name=Color Scheme Editor
+--- gedit-plugins-3.8.1/plugins/colorschemer/colorschemer.plugin.desktop.in.in
++++ gedit-plugins-3.8.1/plugins/colorschemer/colorschemer.plugin.desktop.in.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=colorschemer
+ IAge=3
+ _Name=Color Scheme Editor
+--- gedit-plugins-3.8.1/plugins/commander/commander.plugin.desktop.in
++++ gedit-plugins-3.8.1/plugins/commander/commander.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=commander
+ IAge=3
+ _Name=Commander
+--- gedit-plugins-3.8.1/plugins/commander/commander.plugin.desktop.in.in
++++ gedit-plugins-3.8.1/plugins/commander/commander.plugin.desktop.in.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=commander
+ IAge=3
+ _Name=Commander
+--- gedit-plugins-3.8.1/plugins/dashboard/dashboard.plugin.desktop.in
++++ gedit-plugins-3.8.1/plugins/dashboard/dashboard.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=dashboard
+ IAge=3
+ _Name=Dashboard
+--- gedit-plugins-3.8.1/plugins/dashboard/dashboard.plugin.desktop.in.in
++++ gedit-plugins-3.8.1/plugins/dashboard/dashboard.plugin.desktop.in.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=dashboard
+ IAge=3
+ _Name=Dashboard
+--- gedit-plugins-3.8.1/plugins/joinlines/joinlines.plugin.desktop.in
++++ gedit-plugins-3.8.1/plugins/joinlines/joinlines.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=joinlines
+ IAge=3
+ _Name=Join/Split Lines
+--- gedit-plugins-3.8.1/plugins/joinlines/joinlines.plugin.desktop.in.in
++++ gedit-plugins-3.8.1/plugins/joinlines/joinlines.plugin.desktop.in.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=joinlines
+ IAge=3
+ _Name=Join/Split Lines
+--- gedit-plugins-3.8.1/plugins/multiedit/multiedit.plugin.desktop.in
++++ gedit-plugins-3.8.1/plugins/multiedit/multiedit.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=multiedit
+ IAge=3
+ _Name=Multi Edit
+--- gedit-plugins-3.8.1/plugins/multiedit/multiedit.plugin.desktop.in.in
++++ gedit-plugins-3.8.1/plugins/multiedit/multiedit.plugin.desktop.in.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=multiedit
+ IAge=3
+ _Name=Multi Edit
+--- gedit-plugins-3.8.1/plugins/smartspaces/smartspaces.plugin.desktop.in
++++ gedit-plugins-3.8.1/plugins/smartspaces/smartspaces.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=smartspaces
+ IAge=3
+ _Name=Smart Spaces
+--- gedit-plugins-3.8.1/plugins/smartspaces/smartspaces.plugin.desktop.in.in
++++ gedit-plugins-3.8.1/plugins/smartspaces/smartspaces.plugin.desktop.in.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=smartspaces
+ IAge=3
+ _Name=Smart Spaces
+--- gedit-plugins-3.8.1/plugins/synctex/synctex.plugin.desktop.in
++++ gedit-plugins-3.8.1/plugins/synctex/synctex.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=synctex
+ IAge=3
+ _Name=SyncTeX
+--- gedit-plugins-3.8.1/plugins/synctex/synctex.plugin.desktop.in.in
++++ gedit-plugins-3.8.1/plugins/synctex/synctex.plugin.desktop.in.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=synctex
+ IAge=3
+ _Name=SyncTeX
+--- gedit-plugins-3.8.1/plugins/terminal/terminal.plugin.desktop.in
++++ gedit-plugins-3.8.1/plugins/terminal/terminal.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=terminal
+ IAge=3
+ _Name=Embedded Terminal
+--- gedit-plugins-3.8.1/plugins/terminal/terminal.plugin.desktop.in.in
++++ gedit-plugins-3.8.1/plugins/terminal/terminal.plugin.desktop.in.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=terminal
+ IAge=3
+ _Name=Embedded Terminal
+--- gedit-plugins-3.8.1/plugins/textsize/textsize.plugin.desktop.in
++++ gedit-plugins-3.8.1/plugins/textsize/textsize.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=textsize
+ IAge=3
+ _Name=Text Size
+--- gedit-plugins-3.8.1/plugins/textsize/textsize.plugin.desktop.in.in
++++ gedit-plugins-3.8.1/plugins/textsize/textsize.plugin.desktop.in.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python3
++Loader=python
+ Module=textsize
+ IAge=3
+ _Name=Text Size
diff --git a/gedit-plugins.spec b/gedit-plugins.spec
index 130ab06..df56f4f 100644
--- a/gedit-plugins.spec
+++ b/gedit-plugins.spec
@@ -1,14 +1,25 @@
+%if 0%{?fedora} > 12
+%global with_zeitgeist 1
+%global with_python3 1
+%else
+%global with_zeitgeist 0
+%global with_python3 0
+%endif
+
+%if %{with_python3}
 %global __python %{__python3}
+%endif
 
 Name:           gedit-plugins
 Version:        3.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins for gedit
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://live.gnome.org/GeditPlugins
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.8/%{name}-%{version}.tar.xz
+Patch0:         gedit-plugins-disable-python3.patch
 
 BuildRequires:  gedit-devel
 BuildRequires:  gnome-doc-utils
@@ -16,15 +27,21 @@ BuildRequires:  perl(XML::Parser)
 BuildRequires:  gettext
 BuildRequires:  cairo-devel
 BuildRequires:  atk-devel
+%if %{with_python3}
 BuildRequires:  python3-devel
-BuildRequires:  pygobject3-devel
 BuildRequires:  python3-gobject
+%else
+BuildRequires:  python-devel
+%endif
+BuildRequires:  pygobject3-devel
 BuildRequires:  intltool
 BuildRequires:  libpeas-devel
 BuildRequires:  dbus-python-devel
 BuildRequires:  vte3-devel
 Requires:       gedit
+%if %{with_python3}
 Requires:       python3-gobject >= %{pygo_version}
+%endif
 # these are needed for gobject-introspection
 Requires:       vte3 >= 0.27.90-2.fc15
 Requires:       gucharmap >= 2.33.2-6.fc15
@@ -35,9 +52,16 @@ A collection of plugins for gedit.
 
 %prep
 %setup -q
+%if !%{with_python3}
+%patch0 -p1 -b .disable-python3
+%endif
 
 %build
+%if %{with_zeitgeist}
 %configure --disable-schemas-install --enable-python
+%else
+%configure --disable-schemas-install --enable-python --with-plugins=bookmarks,bracketcompletion,charmap,codecomment,colorpicker,colorschemer,commander,drawspaces,joinlines,multiedit,smartspaces,synctex,terminal,textsize,wordcompletion
+%endif
 #--with-plugins=bracketcompletion,charmap,codecomment,colorpicker,drawspaces,joinlines,showtabbar,smartspaces,terminal,bookmarks
 make %{?_smp_mflags}
 
@@ -73,6 +97,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 
 %changelog
+* Mon May  6 2013 Marek Kasik <mkasik@redhat.com> - 3.8.1-2
+- Make building of Zeitgeist plugins and usage of python3 conditional
+
 * Mon Apr 15 2013 Kalev Lember <kalevlember@gmail.com> - 3.8.1-1
 - Update to 3.8.1