diff --git a/postgresql-bashprofile b/postgresql-bashprofile
new file mode 100644
index 0000000..289318f
--- /dev/null
+++ b/postgresql-bashprofile
@@ -0,0 +1,6 @@
+
+# Get PGDATA from /etc/sysconfig/postgresql
+if test -f /etc/sysconfig/postgresql; then
+   eval eval $(sed -n '/^POSTGRES_DATADIR=/s//PGDATA=/p' /etc/sysconfig/postgresql)
+   export PGDATA
+fi
diff --git a/postgresql.changes b/postgresql.changes
index ccf4b14..1de86f0 100644
--- a/postgresql.changes
+++ b/postgresql.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep 28 15:04:31 UTC 2015 - max@suse.com
+
+- Move ~postgres/.bash_profile to postgresql-server to avoid a
+  file conflict between the versioned server packages.
+
+-------------------------------------------------------------------
+Wed Feb 18 15:28:45 UTC 2015 - max@suse.com
+
+- Bump version and defaultpackage to 9.4.
+
 -------------------------------------------------------------------
 Tue Sep 17 11:44:19 UTC 2013 - max@suse.com
 
diff --git a/postgresql.spec b/postgresql.spec
index 6926925..e9ee585 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -15,18 +15,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define defaultpackage postgresql93
+%define defaultpackage postgresql94
 
 Name:           postgresql
 Summary:        Basic Clients and Utilities for PostgreSQL
 License:        PostgreSQL
 Group:          Productivity/Databases/Tools
-Version:        9.3
+Version:        9.4
 Release:        0
 Url:            http://www.postgresql.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       %defaultpackage
 BuildArch:      noarch
+Source0:        postgresql-bashprofile
+
 
 %description
 PostgreSQL is an advanced object-relational database management system
@@ -155,7 +157,9 @@ and triggers.
 echo "This is a dummy package to provide a dependency on the default PostgreSQL version." > README
 
 %install
-# Nothing to do here
+mkdir -p %buildroot/var/lib/pgsql/
+sed 's,@LIBDIR@,%_libdir,g' %{SOURCE0} > \
+        %buildroot/var/lib/pgsql/.bash_profile
 
 %files
 %defattr(-,root,root,-)
@@ -164,6 +168,8 @@ echo "This is a dummy package to provide a dependency on the default PostgreSQL
 %files server
 %defattr(-,root,root,-)
 %doc README
+%attr(750,postgres,postgres) %dir /var/lib/pgsql
+%attr(640,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile
 
 %files docs
 %defattr(-,root,root,-)