diff --git a/hwloc.spec b/hwloc.spec
index 971b25d..e568469 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -1,11 +1,12 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
-Version:   1.8.1
-Release:   2%{?dist}
+Version:   1.9
+Release:   1%{?dist}
 License:   BSD
 Group:     Applications/System
 URL:       http://www.open-mpi.org/projects/hwloc/
 Source0:   http://www.open-mpi.org/software/hwloc/v%{version}/downloads/%{name}-%{version}.tar.bz2
+Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 
 BuildRequires: cairo-devel
 BuildRequires: libpciaccess-devel
@@ -23,7 +24,6 @@ BuildRequires: libibverbs-devel
 %ifnarch s390 s390x %{arm} aarch64
 BuildRequires: numactl-devel
 %endif
-Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 The Portable Hardware Locality (hwloc) software package provides 
@@ -42,7 +42,7 @@ about the hardware, bind processes, and much more.
 %package devel
 Summary:   Headers and shared development libraries for hwloc
 Group:     Development/Libraries
-Requires:  %{name}-libs = %{version}-%{release}
+Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description devel
 Headers and shared object symbolic links for the hwloc.
@@ -54,6 +54,14 @@ Group:     Development/Libraries
 %description libs
 Run time libraries for the hwloc
 
+%package gui
+Summary:   The gui-based hwloc program(s)
+Group:     Development/Libraries
+Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description gui
+GUI-based tool for displaying system topology information.
+
 %prep
 %setup -q
 
@@ -65,9 +73,6 @@ make %{?_smp_mflags} V=1
 %install
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
-#Fix wrong permition on file hwloc-assembler-remote => I have reported this to upstream already
-chmod 0755 %{buildroot}%{_bindir}/hwloc-assembler-remote
-
 # We don't ship .la files.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
@@ -83,10 +88,9 @@ make check
 
 %files
 %{_bindir}/%{name}*
-%{_bindir}/lstopo
 %{_bindir}/lstopo-no-graphics
 %{_mandir}/man1/%{name}*
-%{_mandir}/man1/lstopo*
+%{_mandir}/man1/lstopo-no-graphics*
 
 %files devel
 %{_libdir}/pkgconfig/*
@@ -106,8 +110,17 @@ make check
 %{_defaultdocdir}/%{name}/*[^c]
 %{_libdir}/libhwloc*so.*
 
+%files gui
+%{_bindir}/lstopo
+%{_mandir}/man1/lstopo.*
+
 
 %changelog
+* Tue Apr  1 2014 Jirka Hladky <hladky.jiri@gmail.com> - 1.9-1
+- Update to 1.9
+- Split out lstopo into a -gui subpackage, so the hwloc base package
+  does not pull in all of X.
+
 * Fri Feb 14 2014 Jirka Hladky <hladky.jiri@gmail.com> - 1.8.1-2
 - Fixed BuildRequires
 
diff --git a/sources b/sources
index ce3bb76..a25b8be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a4e85f5dc94d2404ed19de3b94fa3fd  hwloc-1.8.1.tar.bz2
+1954f690211227cb0a665624aab6aaa6  hwloc-1.9.tar.bz2