diff --git a/.gitignore b/.gitignore
index 145ce13..f8cfbff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 wxGlade-0.6.3tip20100625.tar.gz
+/wxGlade-0.6.8.tar.gz
diff --git a/sources b/sources
index e55252f..0d3f36d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97c9e3c0ec8d69496210c28fb1028f34  wxGlade-0.6.3tip20100625.tar.gz
+414dd5ac69dae665f1dd4f9f8ea36a98  wxGlade-0.6.8.tar.gz
diff --git a/wxGlade.spec b/wxGlade.spec
index f7bb491..66eb299 100644
--- a/wxGlade.spec
+++ b/wxGlade.spec
@@ -1,17 +1,17 @@
-Summary: 	A wxWidgets/wxPython/wxPerl GUI designer
-Name: 		wxGlade
-Version: 	0.6.3tip20100625
-Release:    	7%{?dist}
-Source0: 	http://downloads.sourceforge.net/wxglade/%{name}-%{version}.tar.gz
-Source1:    wxglade.desktop
-Source2:    wxglade.png
-License: 	MIT
-URL:        http://wxglade.sourceforge.net/
-Group: 		Development/Tools
-BuildArch: 	noarch
-BuildRequires: desktop-file-utils
-Requires: 	python >= 2.2
-Requires: 	wxPython >= 2.6
+Name:           wxGlade
+Version:        0.6.8
+Release:        1%{?dist}
+Summary:        A wxWidgets/wxPython/wxPerl GUI designer
+License:        MIT
+URL:            http://wxglade.sourceforge.net
+Source0:        http://downloads.sourceforge.net/project/wxglade/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source1:        wxglade.desktop
+Source2:        wxglade.png
+BuildArch:      noarch
+BuildRequires:  desktop-file-utils
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
+Requires:       wxPython
 
 %description
 wxGlade is a GUI designer written in Python with the popular GUI
@@ -22,67 +22,47 @@ interfaces. At the moment it can generate Python, C++, Perl and XRC
 %prep
 %setup -q
 
-
 %build
-# nothing to do
-
+%{__python2} setup.py build
 
 %install
-# cleanup
-
-# make dirs
-install -m 755 -d $RPM_BUILD_ROOT%{_bindir}
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/%{name}/codegen
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/%{name}/edit_sizers
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/gtk
-
-# copy files needed at runtime
-install -m644 -p *.py $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m644 -p codegen/*  $RPM_BUILD_ROOT%{_datadir}/%{name}/codegen
-install -m644 -p edit_sizers/*  $RPM_BUILD_ROOT%{_datadir}/%{name}/edit_sizers
-install -m644 -p icons/*.ico icons/*.png icons/*.xpm  $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
-install -m644 -p icons/gtk/*.xpm  $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/gtk
-cp -Rp widgets  $RPM_BUILD_ROOT%{_datadir}/%{name}/widgets
-find docs -type f -exec chmod 644 {} \;
-
-# make a launcher script
-cat > $RPM_BUILD_ROOT%{_bindir}/wxglade <<EOF
-#!/bin/bash
-exec python %{_datadir}/%{name}/wxglade.py "\$@"
-EOF
-chmod +x $RPM_BUILD_ROOT%{_bindir}/wxglade
-
-# install desktop entry
-desktop-file-install  \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications         \
-  %{SOURCE1}
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-install -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-
-# docs symlink
-ln -s %{_docdir}/%{name}-%{version}/docs $RPM_BUILD_ROOT%{_datadir}/%{name}/docs
+%{__python2} setup.py install --prefix=%{_prefix} -O1 --skip-build --root=%{buildroot}
+
+# Let's handle docs by ourselves.
+rm -rf %{buildroot}%{_datadir}/doc/wxglade
+
+# Install desktop related entries
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:1}
+install -pm 755 -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+install -pm 644 %{S:2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-desktop-database %{_datadir}/applications &>/dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-desktop-database %{_datadir}/applications &>/dev/null || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %doc docs CHANGES.txt README.txt TODO.txt credits.txt license.txt
 %{_bindir}/wxglade
-%{_datadir}/%{name}
-%{_datadir}/icons/hicolor/32x32/apps/*
+%{_datadir}/icons/hicolor/*x*/apps/*
 %{_datadir}/applications/*
-
+%{_mandir}/man1/wxglade.1*
+%{python2_sitelib}/wxglade
+%{python2_sitelib}/%{name}-%{version}-py%{python2_version}.egg-info
 
 %changelog
+* Wed Sep 11 2013 Christopher Meng <rpm@cicku.me> - 0.6.8-1
+- New version(BZ#1006631) with major cleanup/rewrite.
+- Fix unversioned docdir issue(BZ#993886).
+- Fix old version bug(BZ#948782).
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.3tip20100625-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild