diff --git a/elfutils.changes b/elfutils.changes
index 7fb0a8d..9d3cb93 100644
--- a/elfutils.changes
+++ b/elfutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 15 15:06:23 UTC 2014 - jengelh@inai.de
+
+- Update homepage URL and improve RPM group classification
+
 -------------------------------------------------------------------
 Thu Jun 19 21:08:35 UTC 2014 - tonyj@suse.com
 
diff --git a/elfutils.spec b/elfutils.spec
index 39e478a..ba3125a 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -21,8 +21,10 @@ Version:        0.158
 Release:        0
 Summary:        Higher-level library to access ELF
 License:        SUSE-GPL-2.0-with-OSI-exception
-Group:          System/Libraries
-Url:            http://elfutils.fedorahosted.org
+Group:          Development/Tools/Building
+Url:            http://fedorahosted.org/elfutils/
+
+#Git-Clone:	git://git.fedorahosted.org/git/elfutils
 Source:         https://fedorahosted.org/releases/e/l/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Source1:        README-BEFORE-ADDING-PATCHES
 Source2:        baselibs.conf
@@ -49,7 +51,7 @@ is a part of elfutils package.
 
 %package -n libasm1
 Summary:        A collection of utilities and DSOs to handle compiled objects
-Group:          Development/Tools/Other
+Group:          System/Libraries
 
 %description -n libasm1
 Elfutils is a collection of utilities, including ld (a linker), nm (for
@@ -61,7 +63,7 @@ which implement DWARF, ELF, and machine-specific ELF handling.
 
 %package -n libasm-devel
 Summary:        A collection of utilities and DSOs to handle compiled objects
-Group:          Development/Tools/Other
+Group:          Development/Libraries/C and C++
 Requires:       glibc-devel
 Requires:       libasm1 = %{version}
 
@@ -75,7 +77,7 @@ which implement DWARF, ELF, and machine-specific ELF handling.
 
 %package -n libebl1
 Summary:        A collection of utilities and DSOs to handle compiled objects
-Group:          Development/Tools/Other
+Group:          System/Libraries
 Provides:       libebl = %{version}
 Obsoletes:      libebl < %{version}
 
@@ -137,7 +139,7 @@ This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
 %prep
-%setup -q -n elfutils-%{version}
+%setup -q
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1