diff --git a/.gitignore b/.gitignore
index b29a287..4a406bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-/libyui-gtk-2.43.3-917b2ba.tar.gz
+*~
+*.rpm
+*.tar*
+results_*/
diff --git a/libyui-gtk.spec b/libyui-gtk.spec
index 1386f84..c2937b7 100644
--- a/libyui-gtk.spec
+++ b/libyui-gtk.spec
@@ -1,29 +1,24 @@
-%global commit 917b2ba3dc947e384b7ae581d73cd21a04ceeaa1
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libsuffix yui
 %global libname lib%{libsuffix}
 %global devel_min_ver 3.0.4
 %global major_so_ver 5
 
-%global _hardened_build 1
-
-
 Name:		%{libname}-gtk
-Version:	2.43.3
-Release:	4%{?dist}
-License:	LGPLv2 or LGPLv3
-Source:		https://github.com/%{libname}/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
-Group:		System Environment/Libraries
+Version:	2.43.7
+Release:	1%{?dist}
+Summary:	Gtk3 User Interface for %{libname}
 
-BuildRequires:	doxygen
+License:	LGPLv2 or LGPLv3
+URL:		https://github.com/%{libname}/%{name}
+Source0:	%{url}/archive/%{name}/master/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+BuildRequires:	cmake
+BuildRequires:	doxygen-latex
 BuildRequires:	fdupes
 BuildRequires:	graphviz
 BuildRequires:	gtk3-devel
 BuildRequires:	%{libname}-devel >= %{devel_min_ver}
 
-URL:		https://github.com/%{libname}/%{name}/
-Summary:	Gtk3 User Interface for %{libname}
-
 Provides:	%{libsuffix}-ui%{?_isa} = %{major_so_ver}
 
 
@@ -32,15 +27,12 @@ This package contains the Gtk3 user interface component for %{libname}.
 
 
 %package devel
-
-Group:		Development/Libraries
+Summary:	Files needed for developing with %{name}
 
 Requires:	gtk3-devel%{?_isa}
 Requires:	%{libname}-devel%{?_isa} >= %{devel_min_ver}
 Requires:	%{name}%{?_isa} = %{version}-%{release}
-
-Summary:	Files needed for developing with %{name}
-
+Requires:	%{name}-devel-common = %{version}-%{release}
 
 %description devel
 %{libname} can be used independently of YaST for generic (C++) applications
@@ -52,37 +44,36 @@ This package is only needed when you want to develop an extension for
 %{name} which is not covered within the UI-plugin.
 
 
-%package doc
-
-Group:		Documentation
+%package devel-common
+Summary:	Common files needed for developing with %{name}
 
 BuildArch:	noarch
+Requires:	%{name}-devel = %{version}-%{release}
 
+%description devel-common
+%{summary}, e.g. headers and CMake-macros.
+
+
+%package doc
 Summary:	Documentation files for %{name}
-
+BuildArch:	noarch
 
 %description doc
 This package includes the developer's documentation as HTML for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{commit}
+%setup -q -n %{name}-%{name}-master-%{version}
 ./bootstrap.sh
 
 
 %build
-
 mkdir -p build
-cd build
-
+pushd build
 %cmake .. \
 	-DENABLE_WERROR=OFF \
 	-DPREFIX=%{_prefix} \
 	-DLIB_DIR=%{_libdir} \
-	-DDOC_DIR=%{_defaultdocdir} \
-	-DDOC_SUBDIR=%{name}-%{version} \
-	-DINSTALL_DOCS=ON \
-	-DSKIP_LATEX=ON \
 	-DCMAKE_BUILD_TYPE=RELEASE \
 	-DRESPECT_FLAGS=ON
 
@@ -91,35 +82,41 @@ make %{?_smp_mflags} docs
 
 
 %install
-cd build
-
+pushd build
 %make_install
 
-install -pm0644 ../COPYING* %{buildroot}/%{_defaultdocdir}/%{name}-%{version}
-install -pm0644 ../ChangeLog %{buildroot}/%{_defaultdocdir}/%{name}-%{version}
+# remove preinstalled stuff in docdir
+# get's picked-up by -doc-pkg later
+rm -rf %{buildroot}%{_defaultdocdir} ../examples/CMake*
 
-%fdupes %{buildroot}/%{_defaultdocdir}/%{name}-%{version}
+# prep docs
+mv ./doc/html ..
+mv ./doc/latex/refman.pdf ..
+rm -rf ../html/*.m*
+%fdupes ../html
 
 
 %files
-%{_libdir}/%{libsuffix}/lib*.so.%{major_so_ver}*
-%dir %{_defaultdocdir}/%{name}-%{version}
-%doc %{_defaultdocdir}/%{name}-%{version}/C*
-
+%doc COPYING*
+%{_libdir}/%{libsuffix}/%{name}.so.%{major_so_ver}*
 
 %files devel
-%{_libdir}/%{libsuffix}/lib*.so
-%{_includedir}/%{libsuffix}/*
+%{_libdir}/%{libsuffix}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
-%{_libdir}/cmake/%{name}
+%{_libdir}/cmake
 
+%files devel-common
+%{_includedir}/%{libsuffix}/*
 
 %files doc
-%dir %{_defaultdocdir}/%{name}-%{version}
-%doc %{_defaultdocdir}/%{name}-%{version}/*/
+%doc COPYING* ChangeLog *.pdf html/
 
 
 %changelog
+* Fri Aug 30 2013 Björn Esser <bjoern.esser@gmail.com> - 2.43.7-1
+- new upstream version
+- restructured spec to match with libyui
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.43.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index e6ff93d..67f708c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d45f07b7fab7ca2d7176fb5815dfe39b  libyui-gtk-2.43.3-917b2ba.tar.gz
+ae74f8de3323f5ea9968bde07da521aa  libyui-gtk-2.43.7.tar.gz