diff --git a/wireless-tools.changes b/wireless-tools.changes
index a1a34e7..461ecec 100644
--- a/wireless-tools.changes
+++ b/wireless-tools.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Aug 23 19:04:04 CEST 2011 - dmueller@suse.de
+
+- update to 30.pre9:
+  o Create iwlib-private.h to minimise namespace pollution [iwlib]
+  o More fix to the 64->32bit band-aid for encode [iwlib]
+  o Update udev rule to remove a warning [19-udev-ifrename.rules]
+    (from Ritesh Raj Sarraf <rrs@researchut.com> and Guus Sliepen)
+  o Propagate error codes out of main for get [iwconfig/iwlist/iwspy]
+   (From Guus Sliepen <guus@debian.org>)
+  o Remove spurious commands from Czech iwconfig manpage.
+
 -------------------------------------------------------------------
 Tue Feb  8 13:46:48 CET 2011 - vbotka@suse.de
 
diff --git a/wireless-tools.spec b/wireless-tools.spec
index 8046cca..6ccec57 100644
--- a/wireless-tools.spec
+++ b/wireless-tools.spec
@@ -22,14 +22,14 @@ Name:           wireless-tools
 BuildRequires:  openssl-devel udev
 Summary:        Tools for a wireless LAN
 %define major_version 30
-Version:        %{major_version}.pre8
+Version:        %{major_version}.pre9
 Release:        19
 Group:          Hardware/Wifi
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 AutoReqProv:    on
-Source:         wireless_tools.%{version}.tar.bz2
+Source:         wireless_tools.%{version}.tar.gz
 Patch:          wireless_tools.dif
 Patch1:         lwepgen-as-needed.patch
 Source2:        suse-files.tar.gz
@@ -153,6 +153,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libiw-devel
 %defattr(-,root,root)
 %{_libdir}/libiw.so
-%{_includedir}/*
+%{_includedir}/iwlib.h
+%{_includedir}/wireless.h
 
 %changelog
diff --git a/wireless_tools.30.pre8.tar.bz2 b/wireless_tools.30.pre8.tar.bz2
deleted file mode 100644
index f59c167..0000000
--- a/wireless_tools.30.pre8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6be1b682e7d465a45209a231c6a9cbffe4a1e25e32781a363c41cbb2218a50bb
-size 202996
diff --git a/wireless_tools.30.pre9.tar.gz b/wireless_tools.30.pre9.tar.gz
new file mode 100644
index 0000000..054d8ab
--- /dev/null
+++ b/wireless_tools.30.pre9.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63
+size 348477
diff --git a/wireless_tools.dif b/wireless_tools.dif
index b65f00f..b035237 100644
--- a/wireless_tools.dif
+++ b/wireless_tools.dif
@@ -1,8 +1,6 @@
-Index: Makefile
-===================================================================
---- Makefile.orig
+--- Makefile
 +++ Makefile
-@@ -19,7 +19,7 @@ RANLIB = ranlib
+@@ -19,7 +19,7 @@
  ## a local version (non-root).
  ## Standard distros should comment that option to save space and to
  ## build libiw.so used by third parties...
@@ -11,7 +9,7 @@ Index: Makefile
  
  ## Uncomment this to build without using libm (less efficient).
  ## This is mostly useful for embedded platforms without maths.
-@@ -105,7 +105,7 @@ endif
+@@ -105,7 +105,7 @@
  
  # Other flags
  CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
@@ -20,7 +18,7 @@ Index: Makefile
  #CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
  DEPFLAGS=-MMD
  XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) $(WEDEF_FLAG)
-@@ -121,6 +121,9 @@ all:: $(IWLIB) $(PROGS)
+@@ -121,6 +121,9 @@
  %.so: %.c wireless.h
  	$(CC) $(XCFLAGS) $(PICFLAG) -c -o $@ $<
  
@@ -30,44 +28,3 @@ Index: Makefile
  iwconfig: iwconfig.o $(IWLIB)
  
  iwlist: iwlist.o $(IWLIB)
-Index: iwlib.h
-===================================================================
---- iwlib.h.orig
-+++ iwlib.h
-@@ -60,36 +60,6 @@
- /* Private copy of Wireless extensions (in this directoty) */
- #include "wireless.h"
- 
--/* Make gcc understant that when we say inline, we mean it.
-- * I really hate when the compiler is trying to be more clever than me,
-- * because in this case gcc is not able to figure out functions with a
-- * single call site, so not only I have to tag those functions inline
-- * by hand, but then it refuse to inline them properly.
-- * Total saving for iwevent : 150B = 0.7%.
-- * Fortunately, in gcc 3.4, they now automatically inline static functions
-- * with a single call site. Hurrah !
-- * Jean II */
--#undef IW_GCC_HAS_BROKEN_INLINE
--#if __GNUC__ == 3
--#if __GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 4
--#define IW_GCC_HAS_BROKEN_INLINE	1
--#endif	/* __GNUC_MINOR__ */
--#endif	/* __GNUC__ */
--/* However, gcc 4.0 has introduce a new "feature", when compiling with
-- * '-Os', it does not want to inline iw_ether_cmp() and friends.
-- * So, we need to fix inline again !
-- * Jean II */
--#if __GNUC__ == 4
--#define IW_GCC_HAS_BROKEN_INLINE	1
--#endif	/* __GNUC__ */
--/* Now, really fix the inline */
--#ifdef IW_GCC_HAS_BROKEN_INLINE
--#ifdef inline
--#undef inline
--#endif	/* inline */
--#define inline		inline		__attribute__((always_inline))
--#endif	/* IW_GCC_HAS_BROKEN_INLINE */
--
- #ifdef __cplusplus
- extern "C" {
- #endif