diff --git a/.cvsignore b/.cvsignore
index fea85a4..818f317 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-FSlint-2.02.tar.gz
+FSlint-2.11.tar.gz
diff --git a/fslint-desktop.patch b/fslint-desktop.patch
deleted file mode 100644
index 0bfdc77..0000000
--- a/fslint-desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- fslint.desktop~	2003-03-09 01:22:35.000000000 +0200
-+++ fslint.desktop	2003-07-30 23:08:40.000000000 +0300
-@@ -2,6 +2,8 @@
- Name=FSlint
- Comment=File System Lint
- Exec=FSlint
--Terminal=0
-+Terminal=false
- Type=Application
- Icon=fslint_icon.png
-+Encoding=UTF-8
-+Categories=Application;Utility;System;GTK;
diff --git a/fslint.spec b/fslint.spec
index 42c3566..75fdf9e 100644
--- a/fslint.spec
+++ b/fslint.spec
@@ -1,34 +1,29 @@
-%define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pysitedir %{_libdir}/python%{pyver}/site-packages
-
 Name:           fslint
-Version:        2.02
+Version:        2.11
 Release:        2
-Summary:        Utility to find and clean "lint" on a filesystem
+Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.pixelbeat.org/fslint/
-Source0:        http://www.pixelbeat.org/fslint/FSlint-2.02.tar.gz
-Patch0:         %{name}-desktop.patch
+Source0:        http://www.pixelbeat.org/fslint/FSlint-2.11.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
+BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= %{pyver}, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
-FSlint is a toolkit to find all redundant disk usage.  It includes a
-GUI as well as a command line interface.
+FSlint is a toolkit to find all redundant disk usage (duplicate files
+for e.g.). It includes a GUI as well as a command line interface.
 
 
 %prep
 %setup -q -n FSlint-%{version}
-%patch0 -p0
+%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' FSlint
+%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' FSlint
 mv fslint/fstool/README README.fstool
 mv fslint/rmlint/README README.rmlint
-echo "liblocation = '%{_datadir}/%{name}'" > __init__.py
-perl -pi -e 's|^Icon=(.*)$|Icon=%{_datadir}/%{name}/$1|' fslint.desktop
 
 
 %build
@@ -37,29 +32,28 @@ perl -pi -e 's|^Icon=(.*)$|Icon=%{_datadir}/%{name}/$1|' fslint.desktop
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -p -m 0755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
-install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/{fstool,rmlint}
-install -p -m 0644 fslint.glade fslint_icon.png \
+install -Dpm 755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
+ln -s FSlint $RPM_BUILD_ROOT%{_bindir}/fslint
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,rmlint}
+install -pm 644 fslint.glade fslint_icon.png \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -p -m 0755 fslint/{find*,fsl*,get*,zipdir} \
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -s %{_datadir}/%{name}/fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -pm 755 fslint/{find*,fsl*,get*,zipdir} \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint
-install -p -m 0755 fslint/fstool/* \
+install -pm 755 fslint/fstool/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/fstool
-install -p -m 0755 fslint/rmlint/* \
+install -pm 755 fslint/rmlint/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/rmlint
 
 make -C po DESTDIR=$RPM_BUILD_ROOT LOCALEDIR=%{_datadir}/locale install
 
-install -D -p -m 0644 __init__.py \
-  $RPM_BUILD_ROOT%{pysitedir}/FSlint/__init__.py
-touch $RPM_BUILD_ROOT%{pysitedir}/FSlint/__init__.py{c,o}
-
 desktop-file-install \
   --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode 0644 \
+  --mode 644 \
   --add-category X-Fedora \
-  fslint.desktop
+  %{name}.desktop
 
 %find_lang %{name}
 
@@ -71,15 +65,31 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc doc/* README.*
-%{_bindir}/*
-%dir %{pysitedir}/FSlint
-%{pysitedir}/FSlint/*.py
-%ghost %{pysitedir}/FSlint/*.py?
+%{_bindir}/*lint
 %{_datadir}/%{name}
-%{_datadir}/applications/*
+%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/pixmaps/fslint_icon.png
 
 
 %changelog
+* Fri Mar 18 2005 Pádraig Brady <P at draigBrady.com> - 2.11-2
+- Update to 2.11
+
+* Wed Mar 16 2005 Pádraig Brady <P at draigBrady.com> - 0:2.10-0.fdr.2
+- Update to 2.10
+
+* Tue Sep  9 2004 Pádraig Brady <P at draigBrady.com> - 0:2.08-0.fdr.2
+- Fix locale support broken in previous version
+
+* Wed Sep  1 2004 Pádraig Brady <P at draigBrady.com> - 0:2.08-0.fdr.1
+- Update to 2.08.
+- Remove redundant patch.
+
+* Wed May  5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.06-0.fdr.1
+- Update to 2.06.
+- Add %%{_bindir}/fslint symlink.
+- Make installation Python version independent.
+
 * Thu Aug 28 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.02-0.fdr.2
 - Requires: cpio, remove redundant findutils dependency (bug 539).
 - Fix version in dependency on python.
diff --git a/sources b/sources
index f71eb2d..c8a6fd8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24d101f560d9018161ee10e1eb12ec37  FSlint-2.02.tar.gz
+518ef710828f6b55adf7fc665e9146f9  FSlint-2.11.tar.gz