diff --git a/libnetfilter_conntrack-0.9.1+git18.tar.xz b/libnetfilter_conntrack-0.9.1+git18.tar.xz
deleted file mode 100644
index 6cf9494..0000000
--- a/libnetfilter_conntrack-0.9.1+git18.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31d4b34f61d67c1769824afce3b2bd36ee50f156a046d1979a432460b7bc8fe9
-size 52584
diff --git a/libnetfilter_conntrack-1.0.0.tar.bz2 b/libnetfilter_conntrack-1.0.0.tar.bz2
new file mode 100644
index 0000000..82537cb
--- /dev/null
+++ b/libnetfilter_conntrack-1.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a09a61ad26a43190a1858cb0391198ae3c952a9bdc4488e63dcb5c59aa3d608
+size 380555
diff --git a/libnetfilter_conntrack-1.0.0.tar.bz2.sig b/libnetfilter_conntrack-1.0.0.tar.bz2.sig
new file mode 100644
index 0000000..c0cdea4
Binary files /dev/null and b/libnetfilter_conntrack-1.0.0.tar.bz2.sig differ
diff --git a/libnetfilter_conntrack.changes b/libnetfilter_conntrack.changes
index e5f5ac4..b37d518 100644
--- a/libnetfilter_conntrack.changes
+++ b/libnetfilter_conntrack.changes
@@ -1,8 +1,17 @@
 -------------------------------------------------------------------
-Sun Jan  1 00:01:48 UTC 2012 - jengelh@medozas.de
+Wed Jan  4 18:28:21 UTC 2012 - jengelh@medozas.de
 
-- Update to newer git snapshot 1.0.1+git18
-* license clarifications
+- Update to new upstream release 1.0.0
+* build and compilation updates
+* expect: fix missing parsing of master tuple
+* expect: nfexp_snprintf prints expectation timeout if present
+* expect: nfexp_snprintf displays mask and master tuple information
+* expect: add nfexp_send()
+* expect: support CTA_EXPECT_HELP_NAME
+* src: clarify licensing terms of library (GPLv2+)
+* conntrack: fix size of CTA_PROTOINFO_TCP_FLAGS_ORIGINAL in ARM
+* conntrack: fix set operation for master IPv6 src and dst
+* expect: add nfexp_cmp
 
 -------------------------------------------------------------------
 Thu Dec 29 21:17:48 UTC 2011 - jengelh@medozas.de
diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec
index cdb81fb..cf397d7 100644
--- a/libnetfilter_conntrack.spec
+++ b/libnetfilter_conntrack.spec
@@ -19,19 +19,22 @@
 
 Name:           libnetfilter_conntrack
 %define lname	%{name}3
-Version:        0.9.1+git18
+Version:        1.0.0
 Release:        0
 License:        GPL-2.0+
 Group:          Productivity/Networking/Security
 Url:            http://netfilter.org/projects/libnetfilter_conntrack/
 
 #Git-Clone:	git://git.netfilter.org/libnetfilter_conntrack
-#DL-Source:	http://netfilter.org/projects/%name/files/%name-%version.tar.bz2
-Source:         %name-%version.tar.xz
+%define git_snapshot 0
+Source:         ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/%name-%version.tar.bz2
+Source2:        ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/%name-%version.tar.bz2.sig
 Source3:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if %git_snapshot
 BuildRequires:  autoconf automake >= 1.6 libtool
-BuildRequires:  pkgconfig >= 0.23 pkgconfig(libnfnetlink) >= 1.0.0 xz
+%endif
+BuildRequires:  pkgconfig >= 0.23 pkgconfig(libnfnetlink) >= 1.0.0
 Summary:        Userspace library for the in-kernel connection tracking state table
 
 %description
@@ -68,10 +71,10 @@ used by conntrack-tools among many other applications.
 %setup -q
 
 %build
-if [ ! -e configure ]; then
-	./autogen.sh;
+if [ "%git_snapshot" -ne 0 ] || [ ! -e configure ]; then
+	autoreconf -fi;
 fi;
-%configure --disable-static --includedir=%_includedir/%name-%version
+%configure --disable-static --includedir=%_includedir/%name
 make %{?_smp_mflags}
 
 %install
@@ -88,7 +91,7 @@ rm -f "%buildroot/%_libdir"/*.la;
 
 %files devel
 %defattr(-,root,root)
-%_includedir/libnetfilter_conntrack*
+%_includedir/libnetfilter_conntrack
 %_libdir/libnetfilter_conntrack.so
 %_libdir/pkgconfig/libnetfilter_conntrack.pc