diff --git a/.gitignore b/.gitignore
index 2c6e8e8..2c0da95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 frescobaldi-1.0.2.tar.gz
 frescobaldi-1.0.3.tar.gz
 /frescobaldi-1.2.0.tar.gz
+/frescobaldi-2.0.2.tar.gz
diff --git a/frescobaldi.spec b/frescobaldi.spec
index dc4382d..aabe18c 100644
--- a/frescobaldi.spec
+++ b/frescobaldi.spec
@@ -1,37 +1,29 @@
 Name:           frescobaldi
-Version:        1.2.0
-Release:        2%{?dist}
+Version:        2.0.2
+Release:        1%{?dist}
 Summary:        Edit LilyPond sheet music with ease!
 Group:          Applications/Editors
-# python/hyphenator.py is LGPLv2+
-# python/rational.py is public domain
+# hyphenator.py is LGPLv2+
 # The rest, including the core of the program, is GPLv2+
-License:        GPLv2+ and LGPLv2+ and Public Domain
+License:        GPLv2+ and LGPLv2+
 URL:            http://www.frescobaldi.org/
-Source0:        http://lilykde.googlecode.com/files/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        https://github.com/downloads/wbsoft/%{name}/%{name}-%{version}.tar.gz
 BuildArch:      noarch
-BuildRequires:  cmake
-BuildRequires:  desktop-file-utils
-BuildRequires:  PyKDE4
 
+BuildRequires:  desktop-file-utils
+BuildRequires:  python2-devel
+BuildRequires:  gettext
 Requires:       alsa-utils
 Requires:       lilypond
-Requires:       PyKDE4 
 Requires:       rumor
 Requires:       timidity++
-# Need katepart, kdialog, okularpart, ...
-Requires:       kdebase
-Requires:       kdegraphics
-Requires:       kdesdk
-# For /usr/share/config ownership
-Requires:       kde-filesystem
+Requires:       python-poppler-qt4
 
 %description
 Frescobaldi is a LilyPond sheet music editor for KDE4. It aims to be powerful,
 yet lightweight and easy to use. It features:
 
-    * Enter LilyPond scores, build and preview them with a mouseclick
+    * Enter LilyPond scores, build and preview them with a mouse-click
     * Point-and-click support: click on notes or error messages to jump to the
       correct position
     * A powerful Score Wizard to quickly setup a musical score
@@ -42,7 +34,7 @@ yet lightweight and easy to use. It features:
             music
           o run the document through convert-ly to update it to a newer 
             LilyPond version
-    * Context sensitive autocomplete, helping you to quickly enter LilyPond 
+    * Context sensitive auto-complete, helping you to quickly enter LilyPond 
       commands
     * Expansion manager to enter larger snippets of LilyPond input using short
       mnemonics
@@ -53,30 +45,24 @@ yet lightweight and easy to use. It features:
 
 %prep
 %setup -q
+find -name "*.py"  -exec sed -i -e 's|#! python||' {} \;
 
 %build
-%{cmake_kde4} -DKDE4_BIN_INSTALL_DIR=%{_bindir}
-make %{?_smp_mflags} VERBOSE=1 
+python ./setup.py build 
+cd %{name}_app/po
+make
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} 
+python ./setup.py install --skip-build --prefix=%{buildroot}%{_prefix}
+
 
 ## File lists
-# locale's
-%find_lang %{name}
-# HTML (1.0)
-HTML_DIR=$(kde4-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-   for lang_dir in %{buildroot}$HTML_DIR/* ; do
-      pushd $lang_dir
-         # Replace absolute symlinks with relative ones
-         for i in *; do
-            [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-         done
-      popd
-   done
-fi
+# Create the lang file. %%find_lang does not handle .po files
+for file in %{buildroot}%{python_sitelib}/%{name}_app/po/*.mo; do
+    language=$(basename $file|cut -f 2 -d _|sed 's|\..*||')
+    echo language
+    echo %%lang\($language\) %{python_sitelib}/%{name}_app/po/$language.mo >> frescobaldi.lang
+    done
 
 # desktop file
 desktop-file-install                                         \
@@ -85,10 +71,13 @@ desktop-file-install                                         \
    --add-category=AudioVideo                                 \
    --add-category=X-Notation                                 \
    --delete-original                                         \
-   %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
+   %{name}.desktop
 
-%clean
-rm -rf %{buildroot}
+# sane file permissions
+find %{buildroot}/%{python_sitelib}/%{name}_app/ -name "*.py*" -exec chmod 644 {} \;
+# correct generated shebangs
+sed -i -e 's|#!/usr/bin/python||' \
+    %{buildroot}/%{python_sitelib}/%{name}_app/language_names/generate.py
 
 %post
 update-desktop-database &> /dev/null || :
@@ -105,16 +94,19 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc ChangeLog COPYING README* THANKS TODO
-%{_docdir}/HTML/en/%{name}/
 %{_bindir}/%{name}
+%{python_sitelib}/%{name}_app
+# the following is in our lang file
+%exclude %{python_sitelib}/%{name}_app/po
+%{python_sitelib}/%{name}-%{version}-py2.7.egg-info
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/kde4/apps/%{name}/
-%{_datadir}/config/%{name}rc
 
 %changelog
+* Sun Dec 11 2011 Brendan Jones <brendan.jones.it@gmail.com> - 2.0.2-1
+- New upstream version
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index eeb362e..0771387 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5dbc9425e3aae9890d54649b3d60166  frescobaldi-1.2.0.tar.gz
+6fe3128286354f816038f89ee8940c9b  frescobaldi-2.0.2.tar.gz