diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fe629e1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+dissy-8.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 45d6ab2..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: dissy
-# $Id$
-NAME := dissy
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/dissy-8-about.patch b/dissy-8-about.patch
new file mode 100644
index 0000000..cb3ae3a
--- /dev/null
+++ b/dissy-8-about.patch
@@ -0,0 +1,17 @@
+Fix about box close (thanks to Parag AN)
+http://code.google.com/p/dissy/issues/detail?id=2
+
+Lubomir Rintel <lkundrak@v3.sk>
+
+--- dissy-8/scripts/dissy.about	2009-02-06 11:35:00.000000000 +0100
++++ dissy-8/scripts/dissy	2009-02-06 11:35:51.000000000 +0100
+@@ -189,7 +189,8 @@
+ 	about.set_version("v%s" % (PROGRAM_VERSION) )
+ 	about.set_copyright("(C) Simon Kagstrom, 2006-2009")
+ 	about.set_website(PROGRAM_URL)
+-	about.show()
++	about.run()
++	about.hide()
+ 
+     def redisplayFunction(self):
+ 	try:
diff --git a/dissy.desktop b/dissy.desktop
new file mode 100644
index 0000000..96d2815
--- /dev/null
+++ b/dissy.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Dissy Disassembler
+Comment=Graphical frontend to the objdump disassembler
+GenericName=Dissy Disassembler
+Exec=dissy %f
+Icon=dissy
+Categories=Development;Debugger;
+Terminal=false
diff --git a/dissy.spec b/dissy.spec
new file mode 100644
index 0000000..0e17f45
--- /dev/null
+++ b/dissy.spec
@@ -0,0 +1,77 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+Name:           dissy
+Version:        8
+Release:        2%{?dist}
+Summary:        Graphical frontend to the objdump disassembler
+
+Group:          Development/Tools
+License:        GPLv2
+URL:            http://code.google.com/p/dissy/
+Source0:        http://dissy.googlecode.com/files/%{name}-%{version}.tar.gz
+Source1:        dissy.desktop
+Patch0:         dissy-8-about.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  desktop-file-utils
+BuildRequires:  python-devel
+Requires:       binutils
+Requires:       pygtk2
+Requires:       pygobject2
+
+%description
+Dissy is a graphical frontend to the objdump disassembler, it can be used
+for debugging and browsing compiler-generated code. 
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .about
+
+
+%build
+%{__python} setup.py build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+rm -r $RPM_BUILD_ROOT%{_docdir}
+
+# Icon file. Upstream doesn't use any
+install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -p -m 0644 \
+        $RPM_BUILD_ROOT%{_datadir}/dissy/gfx/red_arrow_left.png \
+        $RPM_BUILD_ROOT%{_datadir}/pixmaps/dissy.png
+
+# Desktop menu entry
+install -d $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+        --vendor '' %{SOURCE1}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/dissy
+%{_datadir}/dissy
+%{_datadir}/applications/dissy.desktop
+%{_datadir}/pixmaps/dissy.png
+%{_mandir}/man1/dissy.1*
+%{python_sitelib}/dissy
+%if 0%{?fedora} > 8
+%{python_sitelib}/*.egg-info
+%endif
+%doc COPYING README
+
+
+%changelog
+* Fri Feb 06 2008 Lubomir Rintel <lkundrak@v3.sk> - 8-2
+- Fix about dialog close
+
+* Mon Feb 02 2008 Lubomir Rintel <lkundrak@v3.sk> - 8-1
+- Initial packaging
diff --git a/sources b/sources
index e69de29..f7b13fa 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+2e48d6fec7c02c0e62a568a7e56ea374  dissy-8.tar.gz