diff --git a/baselibs.conf b/baselibs.conf
index 74eb44b..14c1825 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1,4 @@
 libpq5
+postgresql-devel
+	requires -postgresql-<targettype>
+	requires "libpq5-<targettype> = <version>"
diff --git a/postgresql-libs.changes b/postgresql-libs.changes
index 3bc2c5b..1a9a4e3 100644
--- a/postgresql-libs.changes
+++ b/postgresql-libs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 16 17:17:08 UTC 2011 - jengelh@medozas.de
+
+- Add postgresql-devel to baselibs
+
 -------------------------------------------------------------------
 Wed Jun  8 16:40:03 UTC 2011 - max@novell.com
 
diff --git a/postgresql-libs.spec b/postgresql-libs.spec
index a8474ef..4d46708 100644
--- a/postgresql-libs.spec
+++ b/postgresql-libs.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package postgresql
+# spec file for package postgresql-libs
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %if 0%{?sles_version} && %sles_version <= 11
 %define libs_package 1
 %else
@@ -27,7 +28,7 @@ Name:           postgresql-libs
 %define libecpg libecpg6
 %define buildall 0
 %if 0%{?suse_version} > 910
-BuildRequires:  krb5-devel libxslt-devel 
+BuildRequires:  krb5-devel libxslt-devel
 %endif
 BuildRequires:  openldap2-devel openssl-devel
 Summary:        Basic Clients and Utilities for PostgreSQL
@@ -55,6 +56,7 @@ Patch5:         postgresql-perl514.patch
 Url:            http://www.postgresql.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       postgresql = %pg_minor_version
+
 %description
 PostgreSQL is an advanced object-relational database management system
 that supports an extended subset of the SQL standard, including
@@ -68,6 +70,7 @@ HTML documentation for PostgreSQL can be found in the postgresql-docs
 package.
 
 %if %libs_package
+
 %package libs
 License:        BSD 3-Clause
 Summary:        Shared Libraries Required for PostgreSQL Clients
@@ -91,6 +94,7 @@ PostgreSQL client program or interface. You will need to install this
 package in order to use any other PostgreSQL package or any clients
 that need to connect to a PostgreSQL server.
 %else
+
 %package -n %libpq
 License:        BSD3c(or similar)
 Summary:        Shared Libraries Required for PostgreSQL Clients
@@ -216,12 +220,18 @@ cat %libpq.lang %libecpg.lang > postgresql-libs.lang
 %find_lang ecpg-%{pg_minor_version} %_name-devel.lang 
 %find_lang pg_config-%{pg_minor_version} %_name-devel.lang 
 %if %libs_package
+
 %post -n postgresql-libs -p /sbin/ldconfig
+
 %postun -n postgresql-libs -p /sbin/ldconfig
 %else
+
 %post -n %libpq -p /sbin/ldconfig
+
 %postun -n %libpq -p /sbin/ldconfig
+
 %post -n %libecpg -p /sbin/ldconfig
+
 %postun -n %libecpg -p /sbin/ldconfig
 %endif
 
@@ -230,13 +240,16 @@ rm -rf %buildroot
 rm -f %my_provides
 
 %if %libs_package
+
 %files -n postgresql-libs -f postgresql-libs.lang
 %else
+
 %files -n %libpq -f %libpq.lang
 %endif
 %defattr(-,root,root)
 %_libdir/libpq.so.*
 %if !%libs_package
+
 %files -n %libecpg -f %libecpg.lang
 %defattr(-,root,root)
 %endif
diff --git a/postgresql.spec b/postgresql.spec
index d1875d7..44f104c 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %if 0%{?sles_version} && %sles_version <= 11
 %define libs_package 1
 %else
@@ -22,7 +23,7 @@
 %endif
 
 Name:           postgresql
-BuildRequires:  gettext-devel zlib-devel ncurses-devel readline-devel uuid-devel  
+BuildRequires:  gettext-devel ncurses-devel readline-devel uuid-devel zlib-devel
 BuildRequires:  pam-devel python-devel tcl-devel
 %if 0%{?suse_version} >= 1110
 BuildRequires:  fdupes
@@ -34,7 +35,7 @@ BuildRequires:  fdupes
 %define libecpg libecpg6
 %define buildall 0
 %if 0%{?suse_version} > 910
-BuildRequires:  krb5-devel libxslt-devel 
+BuildRequires:  krb5-devel libxslt-devel
 %endif
 BuildRequires:  openldap2-devel openssl-devel
 Summary:        Basic Clients and Utilities for PostgreSQL
@@ -62,6 +63,7 @@ Patch5:         postgresql-perl514.patch
 Url:            http://www.postgresql.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       postgresql = %pg_minor_version
+
 %description
 PostgreSQL is an advanced object-relational database management system
 that supports an extended subset of the SQL standard, including
@@ -75,6 +77,7 @@ HTML documentation for PostgreSQL can be found in the postgresql-docs
 package.
 
 %if %libs_package
+
 %package libs
 License:        BSD 3-Clause
 Summary:        Shared Libraries Required for PostgreSQL Clients
@@ -98,6 +101,7 @@ PostgreSQL client program or interface. You will need to install this
 package in order to use any other PostgreSQL package or any clients
 that need to connect to a PostgreSQL server.
 %else
+
 %package -n %libpq
 License:        BSD3c(or similar)
 Summary:        Shared Libraries Required for PostgreSQL Clients
@@ -418,12 +422,18 @@ groupadd -g 26 -o -r postgres >/dev/null 2>/dev/null || :
 useradd -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
 	-c "PostgreSQL Server" -u 26 postgres 2>/dev/null || :
 %if %libs_package
+
 %post -n postgresql-libs -p /sbin/ldconfig
+
 %postun -n postgresql-libs -p /sbin/ldconfig
 %else
+
 %post -n %libpq -p /sbin/ldconfig
+
 %postun -n %libpq -p /sbin/ldconfig
+
 %post -n %libecpg -p /sbin/ldconfig
+
 %postun -n %libecpg -p /sbin/ldconfig
 %endif
 
@@ -539,13 +549,16 @@ rm -f %my_provides
 
 %if %buildall
 %if %libs_package
+
 %files -n postgresql-libs -f postgresql-libs.lang
 %else
+
 %files -n %libpq -f %libpq.lang
 %endif
 %defattr(-,root,root)
 %_libdir/libpq.so.*
 %if !%libs_package
+
 %files -n %libecpg -f %libecpg.lang
 %defattr(-,root,root)
 %endif
@@ -567,4 +580,5 @@ rm -f %my_provides
 %_datadir/postgresql/pg_service.conf.sample
 
 %endif
+
 %changelog