diff --git a/openscap-0.5.12.tar.bz2 b/openscap-0.5.12.tar.bz2
new file mode 100644
index 0000000..ec1ea3b
--- /dev/null
+++ b/openscap-0.5.12.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8755916bdcda26d4e8994fda9ee608b62efec73a11b4d726927a7af2a8cd9e0
+size 2258460
diff --git a/openscap-0.5.5.tar.bz2 b/openscap-0.5.5.tar.bz2
deleted file mode 100644
index c5d5e49..0000000
--- a/openscap-0.5.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e17ff009774bafea2cbf6bb2f7c0249be9cdc389d5f2821de1a45d7d8b162b8e
-size 1544419
diff --git a/openscap.changes b/openscap.changes
index d983404..0a866b2 100644
--- a/openscap.changes
+++ b/openscap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul  5 00:16:27 UTC 2010 - bitshuffler #suse@irc.freenode.org
+
+- Update to 0.5.12
+- Proper subpackages added
+
 -------------------------------------------------------------------
 Thu Nov 19 13:50:12 CET 2009 - meissner@suse.de
 
diff --git a/openscap.spec b/openscap.spec
index 03efba0..2247897 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package openscap (Version 0.5.5)
+# spec file for package openscap (Version 0.5.12)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -15,19 +15,29 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+# norootforbuild
 
+%define soname 0
 
 Name:           openscap
-BuildRequires:  python-devel libxml2-devel pcre-devel swig libnl-devel rpm-devel pkg-config
-License:        GPL v3 or later
+Version:        0.5.12
+Release:        1.0
+License:        GNU GPL v3 or later
 Group:          Development/Tools/Other
-AutoReqProv:    on
-Summary:        A Friendly Greeting Program
-Version:        0.5.5
-Release:        1
-Source0:        http://www.open-scap.org/download/%name-%version.tar.bz2
-Patch0:         %name-fixasneeded.patch
+Source:         http://www.open-scap.org/download/%name-%version.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  libcurl-devel
+BuildRequires:  libgcrypt-devel
+BuildRequires:  libnl-devel
+BuildRequires:  libxml2-devel
+# Use package name cause of "have choice for perl(XML::Parser): brp-check-suse perl-XML-Parser"
+BuildRequires:  perl-XML-Parser
+BuildRequires:  pkg-config
+BuildRequires:  python-devel
+BuildRequires:  pcre-devel
+BuildRequires:  rpm-devel
+BuildRequires:  swig
+Summary:        A Set of Libraries for Integration with SCAP
 
 %description
 OpenSCAP is a set of open source libraries providing an easier path for
@@ -39,30 +49,83 @@ related information.
 
 More information about SCAP can be found at nvd.nist.gov.
 
+
+%package -n libopenscap%{soname}
+Group:          System/Libraries
+Summary:        OpenSCAP C Library
+
+%description -n libopenscap%{soname}
+The OpenSCAP C Library for easy integration with SCAP.
+
+
+%package -n libopenscap-devel
+Group:          Development/Libraries/C and C++
+Requires:       libopenscap%{soname} = %{version}
+Summary:        Development Files for OpenSCAP
+
+%description -n libopenscap-devel
+This package contains the development files (mainly C header files) for the 
+OpenSCAP C library.
+
+
+%package -n python-openscap
+Group:          Development/Libraries/Python
+%py_requires
+Summary:        OpenSCAP Python Library
+
+%description -n python-openscap
+The OpenSCAP Python Library for easy integration with SCAP.
+
+
+%package -n perl-openscap
+Group:          Development/Libraries/Perl
+Requires:       perl = %{perl_version}
+Summary:        OpenSCAP Perl Library
+
+%description -n perl-openscap
+The OpenSCAP Perl Library for easy integration with SCAP.
+
+
 %prep
 %setup -q
-%patch0 -p0
 
 %build
-export SUSE_ASNEEDED=0
-autoreconf -i -f
 %configure --disable-silent-rules --disable-probes
-make
+%__make %{?_smp_mflags}
 
 %check
-# make check
+%__make check %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=%{buildroot}
+find %{buildroot} -name "*.la" -delete
+
+%post -n libopenscap%{soname} -p /sbin/ldconfig
+
+%postun -n libopenscap%{soname} -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root)
-%doc COPYING TODO NEWS README THANKS ABOUT-NLS
-%{_bindir}/*
-%{_infodir}/*.gz
-%{_mandir}/*/*
+%{_datadir}/openscap
 
-%changelog
+%files -n libopenscap%{soname}
+%defattr(-, root, root)
+%{_libdir}/libopenscap.so.%{soname}*
+
+%files -n libopenscap-devel
+%defattr(-, root, root)
+%{_includedir}/openscap
+%{_libdir}/libopenscap.so
+
+%files -n python-openscap
+%defattr(-, root, root)
+%{python_sitearch}/_openscap_py.so
+%{python_sitearch}/openscap.*
+
+%files -n perl-openscap
+%defattr(-, root, root)
+%{perl_vendorlib}/openscap.pm
+%{perl_vendorarch}/_openscap_pm.so