diff --git a/zprofile b/zprofile
new file mode 100644
index 0000000..6ca5596
--- /dev/null
+++ b/zprofile
@@ -0,0 +1,8 @@
+# we source the general profile here so we dont have to
+# reimplement it
+setopt nonomatch
+source /etc/profile
+unsetopt nonomatch
+# put your own login shell specific configuration below
+# this line 
+
diff --git a/zsh.changes b/zsh.changes
index 459b0c2..9668843 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Dec  3 15:40:31 CET 2007 - hvogel@suse.de
+
+- cleanup initialization files
+  * Dont source profile from zshenv. profile is not for interactive
+    shells [#343621]
+  * Instead source profile from zprofile so we dont loose the features
+    and its easy to get rid of it.
+  * Source bash.bashrc from zshrc to keep the features and make it
+    possible to get rid of it easier. 
+
 -------------------------------------------------------------------
 Wed Jul  4 16:14:30 CEST 2007 - hvogel@suse.de
 
diff --git a/zsh.spec b/zsh.spec
index 10e3140..365a4da 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -12,7 +12,7 @@
 
 Name:           zsh
 Version:        4.3.4
-Release:        1
+Release:        57
 License:        Other uncritical OpenSource License
 Group:          System/Shells
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -24,7 +24,7 @@ BuildRequires:  libcap
 %endif
 BuildRequires:  yodl
 PreReq:         %{install_info_prereq}
-URL:            http://www.zsh.org
+Url:            http://www.zsh.org
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        zshrc
 Source2:        zshenv
@@ -32,6 +32,7 @@ Source3:        _yast2
 Source4:        _SuSEconfig
 Source5:        _hwinfo
 Source6:        _make
+Source7:        zprofile
 # unused atm. we build the docs with yodl on our own.
 Source20:       %{name}-%{version}-doc.tar.bz2
 Patch0:         %{name}-4.3.4.diff
@@ -111,7 +112,7 @@ groff Doc/intro.ms > intro.txt
 %makeinstall install.info VERSION="%{version}"
 # install SUSE configuration
 %{__install} -m 0755 -Dd  %{buildroot}/{etc,bin}
-%{__install} -m 0644 %{S:1} %{S:2} %{buildroot}/etc
+%{__install} -m 0644 %{S:1} %{S:2} %{S:7} %{buildroot}/etc
 %{__install} -m 0644 %{S:3} %{S:4} %{S:5} %{S:6} %{buildroot}%{_datadir}/%{name}/%version/functions
 # install help files
 %{__install} -m 0755 -Dd    %{buildroot}%{_datadir}/%{name}/help
@@ -134,6 +135,7 @@ groff Doc/intro.ms > intro.txt
 %doc Etc/* intro.txt Misc/compctl-examples Doc/htmldoc
 %config(noreplace) /etc/zshrc
 %config(noreplace) /etc/zshenv
+%config(noreplace) /etc/zprofile
 %{_bindir}/zsh
 /bin/zsh
 %{_libdir}/zsh/
@@ -142,6 +144,14 @@ groff Doc/intro.ms > intro.txt
 %{_mandir}/man1/zsh*.1.gz
 
 %changelog
+* Mon Dec 03 2007 - hvogel@suse.de
+- cleanup initialization files
+  * Dont source profile from zshenv. profile is not for interactive
+  shells [#343621]
+  * Instead source profile from zprofile so we dont loose the features
+  and its easy to get rid of it.
+  * Source bash.bashrc from zshrc to keep the features and make it
+  possible to get rid of it easier.
 * Wed Jul 04 2007 - hvogel@suse.de
 - update to version 4.3.4
   * various bugfixes
diff --git a/zshenv b/zshenv
index 133d0c8..5a53069 100644
--- a/zshenv
+++ b/zshenv
@@ -1,5 +1 @@
-# Source the /etc/profile - done here since we want it to be done as the first
-# thing the zsh does.
-setopt nonomatch
-source /etc/profile
-unsetopt nonomatch
+# set global options for all zsh shells here
diff --git a/zshrc b/zshrc
index 2ccc9e7..7dd87b2 100644
--- a/zshrc
+++ b/zshrc
@@ -1,3 +1,7 @@
+# read bash.bashrc first for some features we dont want 
+# to re-implement here
+source /etc/bash.bashrc
+
 # zsh line editing
 : ${ZSHEDIT:="emacs"}
 : ${TERM:=linux}