diff --git a/exim.spec b/exim.spec
index 790cf9c..71a9320 100644
--- a/exim.spec
+++ b/exim.spec
@@ -24,6 +24,7 @@ BuildRequires:  libXaw-devel libXext-devel libXt-devel openssl-devel tcp_wrapper
 %endif
 %if %{?build_with_mysql:1}0
 BuildRequires:  mysql-devel
+Provides:       exim = %{version}-%{release}
 %endif
 URL:            http://www.exim.org/
 Conflicts:      sendmail sendmail-tls postfix
@@ -49,6 +50,7 @@ Source30:       eximstats-html-update.py
 Source31:       eximstats.conf
 Patch:          exim-4.12-tail.patch
 Patch2:         exim-4.60-external-pcre.diff
+%if !%{?build_with_mysql:1}0
 %package -n eximon
 Summary:        Eximon, an graphical frontend to administer Exim's mail queue
 Group:          Productivity/Networking/Email/Servers
@@ -56,6 +58,7 @@ Group:          Productivity/Networking/Email/Servers
 Summary:        Create HTML reports of exim logs
 Group:          Productivity/Networking/Email/Servers
 Requires:       perl-GD perl-GDGraph perl-GDTextUtil
+%endif
 
 %description
 Exim is a mail transport agent (MTA) developed at the University of
@@ -73,6 +76,7 @@ Authors:
     Philip Hazel <ph10@cus.cam.ac.uk>
 
 
+%if !%{?build_with_mysql:1}0
 %description -n eximon
 This allows administrators to view the exim agent's mail queue and
 logs, and perform a variety of actions on queued messages, such as
@@ -103,6 +107,7 @@ once, if at all. The rest is done by logrotate / cron.)
 Authors:
 --------
     Philip Hazel <ph10@cus.cam.ac.uk>
+%endif
 
 %prep
 %setup -q -n exim-%{version}
@@ -260,7 +265,11 @@ do
 done
 ln -sf exim $RPM_BUILD_ROOT/usr/sbin/sendmail
 ln -sv ../../etc/init.d/exim $RPM_BUILD_ROOT/usr/sbin/rcexim
+%if !%{?build_with_mysql:1}0
 mv $RPM_BUILD_ROOT/usr/sbin/eximon* $RPM_BUILD_ROOT/usr/X11R6/bin/
+%else
+rm $RPM_BUILD_ROOT/usr/sbin/eximon* 
+%endif
 cp -p %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.exim
 install -m 644 %{S:2} $RPM_BUILD_ROOT/etc/logrotate.d/exim
  
@@ -294,10 +303,12 @@ install -m 0755 -d $RPM_BUILD_ROOT/etc/permissions.d
 install -m 0644 $RPM_SOURCE_DIR/permissions.exim $RPM_BUILD_ROOT/etc/permissions.d/exim
 %endif
 # eximstats-html files
+%if !%{?build_with_mysql:1}0
 mkdir -p $RPM_BUILD_ROOT/srv/www/eximstats
 mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d/
 cp -p $RPM_SOURCE_DIR/eximstats.conf $RPM_BUILD_ROOT/etc/apache2/conf.d/
 install -m 0755 $RPM_SOURCE_DIR/eximstats-html-update.py $RPM_BUILD_ROOT/%{_sbindir}
+%endif
  
 %if %{?suse_version:%suse_version}%{?!suse_version:99999} <= 800
 
@@ -387,6 +398,7 @@ exit 0
 /var/adm/fillup-templates/sysconfig.exim
 %dir %attr(750,root,mail) /var/log/exim
 
+%if !%{?build_with_mysql:1}0
 %files -n eximon
 %defattr(-,root,root)
 /usr/X11R6/bin/eximon
@@ -399,6 +411,7 @@ exit 0
 /etc/apache2/conf.d
 /etc/apache2/conf.d/eximstats.conf
 %{_sbindir}/eximstats-html-update.py
+%endif
 
 %changelog -n exim
 * Fri Aug 04 2006 - poeml@suse.de