diff --git a/acpid-2.0.16.tar.gz b/acpid-2.0.16.tar.gz
deleted file mode 100644
index 24ecb66..0000000
--- a/acpid-2.0.16.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d4330e757e66e130ac9385a53d9fa6f102a3b6d95d2e1f0a16d6f3dd1d49683
-size 205682
diff --git a/acpid-2.0.17.tar.xz b/acpid-2.0.17.tar.xz
new file mode 100644
index 0000000..2795042
--- /dev/null
+++ b/acpid-2.0.17.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36b7d2c7deb6a44ae87b28026ff368f96e66b3ee8dd6b6cef4de2c3dbea17a3e
+size 149440
diff --git a/acpid-wrong-memset.patch b/acpid-wrong-memset.patch
deleted file mode 100644
index 76fe042..0000000
--- a/acpid-wrong-memset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnetlink.c.orig	2012-03-16 09:03:33.422941268 -0400
-+++ libnetlink.c	2012-03-16 09:03:52.113707601 -0400
-@@ -41,7 +41,7 @@
- 	int sndbuf = 32768;
- 	int rcvbuf = 32768;
- 
--	memset(rth, 0, sizeof(rth));
-+	memset(rth, 0, sizeof(*rth));
- 
- 	rth->fd = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, protocol);
- 	if (rth->fd < 0) {
diff --git a/acpid.changes b/acpid.changes
index 3884594..89fa14f 100644
--- a/acpid.changes
+++ b/acpid.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Sun Sep 23 04:00:57 UTC 2012 - crrodriguez@opensuse.org
+
+- 2.0.17 release
+    (configure.ac)  (Ted Felix)
+  - Check for chmod.
+    (configure.ac)  (Ted Felix)
+  - Add support for tablet mode switch.  
+    (input_layer.c)  (Fabian Henze)
+  - Incorrect sizeof() usage for memset.  
+    (libnetlink.c)  (Auke Kok)
+  - Close some unclosed fd's.  
+    (acpid.c event.c ud_socket.c)  (Auke Kok)
+  - Do not create pid file when running in foreground.  
+    (acpid.c)  (Cristian Rodriguez)
+  - Free regular expression.  
+    (event.c)  (Cristian Rodriguez)
+- acpid-wrong-memset.patch removed, is upstream
+
 -------------------------------------------------------------------
 Sun Aug 19 18:18:51 UTC 2012 - crrodriguez@opensuse.org
 
diff --git a/acpid.spec b/acpid.spec
index 0515245..718b430 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -17,13 +17,13 @@
 
 
 Name:           acpid
-Version:        2.0.16
+Version:        2.0.17
 Release:        0
 Summary:        Executes Actions at ACPI Events
 License:        GPL-2.0+
 Group:          System/Daemons
 Url:            http://tedfelix.com/linux/acpid-netlink.html
-Source:         http://tedfelix.com/linux/%{name}-%{version}.tar.gz
+Source:         http://tedfelix.com/linux/%{name}-%{version}.tar.xz
 Source2:        rcacpid
 Source3:        README.SuSE
 Source4:        thinkpad_acpi.modprobe
@@ -34,9 +34,8 @@ Source7:        power_button
 Source8:        acpid.service
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch1:         acpid-makefile.patch
-# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch2:         acpid-wrong-memset.patch
 BuildRequires:  systemd
+BuildRequires:  xz
 Requires(pre):  %fillup_prereq
 Requires(pre):  %insserv_prereq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -54,14 +53,13 @@ Configure it in /etc/sysconfig/powermanagement.
 %prep
 %setup -q
 %patch1
-%patch2 
 
 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE9} .
 
 %build
 export LDFLAGS="-Wl,-z,relro,-z,now"
 %configure 
-make OPT="%{optflags}" %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} SBINDIR=%{_sbindir}