diff --git a/.gitignore b/.gitignore
index 08cf220..8793c35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ cups-pk-helper-0.0.4.tar.bz2
 /cups-pk-helper-0.2.1.tar.bz2
 /cups-pk-helper-0.2.2.tar.bz2
 /cups-pk-helper-0.2.4.tar.bz2
+/cups-pk-helper-0.2.5.tar.xz
diff --git a/0001-Be-stricter-when-validating-printer-names.patch b/0001-Be-stricter-when-validating-printer-names.patch
deleted file mode 100644
index 0a6ba60..0000000
--- a/0001-Be-stricter-when-validating-printer-names.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7bf9cbe43ef8f648f308e4760f75c2aa6b61fa8e Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@suse.com>
-Date: Tue, 27 Mar 2012 17:47:07 +0200
-Subject: [PATCH] Be stricter when validating printer names
-
-Only alphanumerical characters and the underscore are valid, and the
-name must not be longer than 127 characters. See
-http://www.cups.org/documentation.php/doc-1.1/sam.html#4_1
----
- src/cups.c | 20 +++++++++++---------
- 1 file changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/src/cups.c b/src/cups.c
-index 332abbe..1b2562b 100644
---- a/src/cups.c
-+++ b/src/cups.c
-@@ -287,23 +287,25 @@ _cph_cups_is_printer_name_valid_internal (const char *name)
-         int i;
-         int len;
- 
-+        /* Quoting http://www.cups.org/documentation.php/doc-1.1/sam.html#4_1:
-+         *
-+         *    The printer name must start with any printable character except
-+         *    " ", "/", and "@". It can contain up to 127 letters, numbers, and
-+         *    the underscore (_).
-+         *
-+         * The first part is a bit weird, as the second part is more
-+         * restrictive. So we only consider the second part. */
-+
-         /* no empty string */
-         if (!name || name[0] == '\0')
-                 return FALSE;
- 
-         len = strlen (name);
--        /* no string that is too long; see comment at the beginning of the
--         * validation code block */
--        if (len > CPH_STR_MAXLEN)
-+        if (len > 127)
-                 return FALSE;
- 
--        /* only printable characters, no space, no /, no # */
-         for (i = 0; i < len; i++) {
--                if (!g_ascii_isprint (name[i]))
--                        return FALSE;
--                if (g_ascii_isspace (name[i]))
--                        return FALSE;
--                if (name[i] == '/' || name[i] == '#')
-+                if (!g_ascii_isalnum (name[i]) && name[i] != '_')
-                         return FALSE;
-         }
- 
--- 
-1.7.12.1
-
diff --git a/cups-pk-helper.spec b/cups-pk-helper.spec
index 9ef0f2c..fd9e487 100644
--- a/cups-pk-helper.spec
+++ b/cups-pk-helper.spec
@@ -1,15 +1,14 @@
 Name:           cups-pk-helper
-Version:        0.2.4
-Release:        2%{?dist}
+Version:        0.2.5
+Release:        1%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
 License:        GPLv2+
-URL:            http://www.vuntz.net/download/cups-pk-helper/
-Source0:        http://cgit.freedesktop.org/cups-pk-helper/snapshot/cups-pk-helper-%{version}.tar.bz2
+URL:            http://www.freedesktop.org/wiki/Software/cups-pk-helper/
+Source0:        http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-%{version}.tar.xz
 
 Patch0:         polkit_result.patch
-Patch1:         0001-Be-stricter-when-validating-printer-names.patch
 
 BuildRequires:  libtool >= 1.4.3
 BuildRequires:  cups-devel >= 1.2
@@ -37,15 +36,10 @@ interfaces available under control of PolicyKit.
 
 %prep
 %setup -q
-
 %patch0 -p1 -b .polkit-result
-%patch1 -p1 -R -b .strict-names
 
 
 %build
-# grr, tarball without configure
-./autogen.sh
-
 %configure
 make %{?_smp_mflags}
 
@@ -67,6 +61,12 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun  7 2013 Marek Kasik <mkasik@redhat.com> - 0.2.5-1
+- Update to 0.2.5
+- Change URL of cups-pk-helper project
+- Use tarballs with configure
+- Fix changelog's dates
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -179,10 +179,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 - Add ability to reconnect to CUPS server after its reload
   (caused by cupsAdminSetServerSettings() or cupsPutFile())
 
-* Tue Jan 28 2009 Marek Kasik <mkasik@redhat.com> 0.0.3-3
+* Wed Jan 28 2009 Marek Kasik <mkasik@redhat.com> 0.0.3-3
 - Add functions for handling jobs (JobRestart, JobCancel, JobSetHoldUntil)
 
-* Tue Jan 26 2009 Marek Kasik <mkasik@redhat.com> 0.0.3-2
+* Mon Jan 26 2009 Marek Kasik <mkasik@redhat.com> 0.0.3-2
 - Add handling of file:/ protocol
 - Change order of checked policies so the PolicyKit asks only for
   "printer-enable" policy when enabling/disabling a printer
diff --git a/sources b/sources
index d73a36f..5c52092 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a039ec6ba20f85a26b2807b28968a749  cups-pk-helper-0.2.4.tar.bz2
+f14fb79da9c85f71e3e29101e179f2fc  cups-pk-helper-0.2.5.tar.xz