diff --git a/libftdi-0.17.tar.gz b/libftdi-0.17.tar.gz
deleted file mode 100644
index c2a5ccf..0000000
--- a/libftdi-0.17.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5c0275125ab68a431375083c9544899e578b8f98b83de1254386d0209feabf0
-size 435901
diff --git a/libftdi-0.18.tar.bz2 b/libftdi-0.18.tar.bz2
new file mode 100644
index 0000000..c040de8
--- /dev/null
+++ b/libftdi-0.18.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fa1432a1de694073b1f89093bb3ad8ac7523b16814cde1e71a0512a58cda338
+size 313253
diff --git a/libftdi1.changes b/libftdi1.changes
index 183e0da..2185e88 100644
--- a/libftdi1.changes
+++ b/libftdi1.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 21 23:08:09 CET 2011 - stepan@coresystems.de
+
+- Update to 0.18
+- Add COPYING.GPL and LICENSE files, too
+
 -------------------------------------------------------------------
 Mon Dec 21 10:18:44 CET 2009 - stepan@coresystems.de
 
diff --git a/libftdi1.spec b/libftdi1.spec
index 200a9c0..e66bdaa 100644
--- a/libftdi1.spec
+++ b/libftdi1.spec
@@ -2,12 +2,13 @@
 
 Summary:   Library to program and control the FTDI USB controller
 Name:      libftdi1
-Version:   0.17
+Version:   0.18
 Release:   1
-License:   LGPL
-Group:     System Environment/Libraries
+License:   LGPL for libftdi and GPLv2+linking exception for the C++ wrapper
+Group:     Hardware/Other
 Vendor:    Intra2net AG
-Source:    libftdi-%{version}.tar.gz
+URL:       http://www.intra2net.com/en/developer/libftdi
+Source:    libftdi-%{version}.tar.bz2
 Source100: %{name}-rpmlintrc
 Patch0:    buildfixes.diff
 Buildroot: /var/tmp/%{name}-%{version}-root
@@ -16,7 +17,7 @@ BuildRequires: libusb-devel, pkgconfig, doxygen
 
 %package -n libftdi1-devel
 Summary:   Header files and static libraries for libftdi
-Group:     Development/Libraries
+Group:     Development/Libraries/C and C++
 Requires:  libftdi1 = %{version}, libusb-devel
 
 %description 
@@ -50,6 +51,7 @@ rm -f $RPM_BUILD_ROOT/usr/bin/bitbang2
 rm -f $RPM_BUILD_ROOT/usr/bin/bitbang_ft2232
 rm -f $RPM_BUILD_ROOT/usr/bin/bitbang_cbus
 rm -f $RPM_BUILD_ROOT/usr/bin/find_all
+rm -f $RPM_BUILD_ROOT/usr/bin/find_all_pp
 rm -f $RPM_BUILD_ROOT/usr/bin/serial_read
 rm -f $RPM_BUILD_ROOT/usr/bin/baud_test
 
@@ -68,8 +70,8 @@ ldconfig
 
 %files
 %defattr(-,root,root)
-%doc COPYING.LIB
-%{_libdir}/libftdi.so.*
+%{_libdir}/libftdi*.so.*
+%doc COPYING.LIB COPYING.GPL LICENSE
 
 %files -n libftdi1-devel
 %defattr(-,root,root)
@@ -78,5 +80,5 @@ ldconfig
 %{_bindir}/libftdi-config
 %{_prefix}/include/*.h
 %{_libdir}/libftdi.so
-%{_libdir}/libftdi.*a
+%{_libdir}/libftdi*.*a
 %{_libdir}/pkgconfig/*.pc