diff --git a/libguestfs.spec b/libguestfs.spec
index 7e536ec..e09368b 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libguestfs
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2011 Michal Hrusecky <mhrusecky@novell.com>
 #
 # All modifications and additions to the file contributed by third parties
@@ -16,6 +16,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %if !%opt
 # get rid of /usr/lib/rpm/find-debuginfo.sh
@@ -24,7 +25,6 @@
 %undefine _build_create_debug
 %endif
 
-
 # disable certain features for a SLES11 build
 # in Virtualization repo in OBS they're reenabled via prjconf
 %if %suse_version == 1110
@@ -48,9 +48,9 @@
 %bcond_without fuse
 
 %if %suse_version > 1210
-%bcond_with ruby_bindings
-%else
 %bcond_without ruby_bindings
+%else
+%bcond_with ruby_bindings
 %endif
 
 # The following defines are overridden in the individual subpackages
@@ -82,18 +82,18 @@ Name:           libguestfs
 %if "%{?_ignore_exclusive_arch}" == ""
 ExclusiveArch:  %ix86 x86_64
 %endif
-BuildRequires:  libacl-devel
-BuildRequires:  autoconf
-BuildRequires:  automake
 BuildRequires:  aaa_base
 BuildRequires:  attr-devel
 BuildRequires:  augeas-devel
 BuildRequires:  autoconf
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  automake
 BuildRequires:  file-devel
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gperf
+BuildRequires:  libacl-devel
 BuildRequires:  libcap-devel
 %if %suse_version >= 1220
 BuildRequires:  libconfig-devel
@@ -128,7 +128,7 @@ BuildRequires:  hivex-devel
 Url:            http://libguestfs.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Compatibility package for guestfs-tools
-License:        GPL-2
+License:        GPL-2.0
 Group:          System/Filesystems
 Version:        1.20.3
 Release:        0
@@ -160,6 +160,7 @@ virtual machines.
 
 %package -n guestfs-tools
 Summary:        Tools for accessing and modifying virtual machine disk images
+License:        GPL-2.0
 Group:          System/Filesystems
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
@@ -202,6 +203,7 @@ virtual machines.
 
 %package -n guestfsd
 Summary:        Daemon for the libguestfs appliance
+License:        GPL-2.0
 Group:          System/Filesystems
 
 %description -n guestfsd
@@ -213,6 +215,7 @@ This package is only required for building the appliance.
 %if %{with ocaml_bindings}
 %package -n ocaml-libguestfs
 Summary:        Provides OCaml support for libguestfs
+License:        GPL-2.0
 Group:          System/Filesystems
 #
 
@@ -221,6 +224,7 @@ Allows OCaml scripts to directly use libguestfs.
 
 %package -n ocaml-libguestfs-devel
 Summary:        Provides OCaml support for libguestfs
+License:        GPL-2.0
 Group:          Development/Libraries/Other
 
 %description -n ocaml-libguestfs-devel
@@ -230,6 +234,7 @@ Allows OCaml scripts to directly use libguestfs.
 %if %{with perl_bindings}
 %package -n perl-Sys-Guestfs
 Summary:        Provides Perl support for libguestfs
+License:        GPL-2.0
 Group:          System/Filesystems
 BuildRequires:  perl
 BuildRequires:  perl(Data::Dumper)
@@ -257,6 +262,7 @@ Allows Perl scripts to directly use libguestfs.
 %if %{with lua_bindings}
 %package -n lua-libguestfs
 Summary:        Provides Lua support for libguestfs
+License:        GPL-2.0
 Group:          System/Filesystems
 BuildRequires:  lua-devel
 %define _configure_lua --enable-lua
@@ -269,6 +275,7 @@ Allows lua scripts to directly use libguestfs.
 %if %{with python_bindings}
 %package -n python-libguestfs
 Summary:        Provides Python support for libguestfs
+License:        GPL-2.0
 Group:          System/Filesystems
 %define pyver %(python -c "import sys; print sys.version[:3]")
 BuildRequires:  python
@@ -285,6 +292,7 @@ Allows Python scripts to directly use libguestfs.
 %if %{with ruby_bindings}
 %package -n rubygem-libguestfs
 Summary:        Ruby bindings for libguestfs
+License:        GPL-2.0
 Group:          System/Filesystems
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
@@ -346,6 +354,7 @@ BuildRequires:  xz
 BuildRequires:  zerofree
 %endif
 Summary:        Virtual machine needed for libguestfs
+License:        GPL-2.0
 Group:          System/Filesystems
 Provides:       libguestfs-data = %{version}
 Obsoletes:      libguestfs-data < %{version}
@@ -357,6 +366,7 @@ This package provides such an image, an initrd and a kernel.
 
 %package devel
 Summary:        Development files for libguestfs
+License:        GPL-2.0
 Group:          Development/Libraries/Other
 Requires:       libguestfs0 = %{version}
 
@@ -379,8 +389,8 @@ guestfish, or use virt-rescue to get a rescue shell for fixing unbootable
 virtual machines.
 
 %package -n libguestfs0
-License:        LGPL-2.1
 Summary:        Runtime library of libguestfs
+License:        LGPL-2.1
 Group:          System/Filesystems
 
 %description -n libguestfs0