diff --git a/.cvsignore b/.cvsignore
index 7b90d25..5e18cd1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ejabberd-2.0.2.tar.gz
+ejabberd-2.0.3.tar.gz
diff --git a/ejabberd.init b/ejabberd.init
index 3ef3548..07fb91c 100644
--- a/ejabberd.init
+++ b/ejabberd.init
@@ -17,15 +17,26 @@
 
 . /etc/rc.d/init.d/functions
 
+if [ -r /etc/sysconfig/ejabberd ]; then
+	. /etc/sysconfig/ejabberd
+fi
+
+if [ ! "$CONFIG_FILE" ]; then
+	CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
+fi
+
 node=`hostname -s`
 
 start() {
         echo -n $"Starting ejabberd: "
+	if [ "$ULIMIT_MAX_FILES" ]; then
+		ulimit -n $ULIMIT_MAX_FILES
+	fi
         daemon --user=ejabberd --check=ejabberd \
 	    "erl" "-pa @libdir@/ejabberd/ebin \
                    -sname ejabberd \
                    -s ejabberd \
-                   -ejabberd config \\\"/etc/ejabberd/ejabberd.cfg\\\" \
+                   -ejabberd config \\\"$CONFIG_FILE\\\" \
                              log_path \\\"/var/log/ejabberd/ejabberd.log\\\" \
                    -sasl sasl_error_logger \\{file,\\\"/var/log/ejabberd/sasl.log\\\"\\} \
                    -mnesia dir \\\"/var/lib/ejabberd/spool\\\" \
diff --git a/ejabberd.spec b/ejabberd.spec
index 3538fa1..09adc59 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -9,6 +9,7 @@ URL:            http://www.ejabberd.im/
 Source0:        http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz
 Source1:        ejabberd.init
 Source2:        ejabberd.logrotate
+Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
 # svn export -r 557 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
@@ -151,12 +152,14 @@ install -D -p -m 0644 %{S:9} %{buildroot}%{_sysconfdir}/pam.d/ejabberdctl
 install -D -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir}/security/console.apps/ejabberdctl
 install -D -p -m 0644 %{S:11} %{buildroot}%{_sysconfdir}/pam.d/ejabberd
 
-mkdir -p %{buildroot}%{_initrddir}
-install -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
-chmod a+x %{buildroot}%{_initrddir}/ejabberd
+# install init-script
+install -D -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
 
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-cp -p %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
+# install config for logrotate
+install -D -p -m 0644  %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
+
+# install sysconfig file
+install -D -p -m 0644  %{S:3} %{buildroot}%{_sysconfdir}/sysconfig/ejabberd
 
 %{__perl} -pi -e 's!\@libdir\@!%{_libdir}!g'  %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
 %{__perl} -pi -e 's!\@version\@!%{version}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
@@ -178,7 +181,7 @@ rm -rf %{buildroot}
 
 %{_initrddir}/ejabberd
 %config(noreplace) %{_sysconfdir}/logrotate.d/ejabberd
-
+%config(noreplace) %{_sysconfdir}/sysconfig/ejabberd
 %config(noreplace) %{_sysconfdir}/pam.d/ejabberd
 %config(noreplace) %{_sysconfdir}/pam.d/ejabberdctl
 %config(noreplace) %{_sysconfdir}/security/console.apps/ejabberdctl
@@ -211,6 +214,13 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Jan 26 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.3-1
+- Ver. 2.0.3
+- Merged some stuff from git://dev.laptop.org/users/martin/ejabberd-xs.git
+
+* Fri Jan 16 2009 Tomas Mraz <tmraz@redhat.com> 2.0.2-4
+- rebuild with new openssl
+
 * Thu Oct  2 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-3
 - Fixed broken ejabberdctl (BZ# 465196)
 
diff --git a/ejabberd.sysconfig b/ejabberd.sysconfig
new file mode 100644
index 0000000..fac25b1
--- /dev/null
+++ b/ejabberd.sysconfig
@@ -0,0 +1,13 @@
+## Settings for ejabberd
+
+## Where should ejabberd find its configuration file?
+#
+#CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
+
+## ULIMIT_MAX_FILES alters the number of files that ejabberd is
+## allowed to have open at once.  If it is unset the system default
+## (usually 1024) will be used.  ejabberd will want over twice as many
+## open files as it has active connections, so if you have a few
+## hundred or more users you will want to set this.
+#
+#ULIMIT_MAX_FILES=1024
diff --git a/import.log b/import.log
index 26451b5..ad80fc8 100644
--- a/import.log
+++ b/import.log
@@ -2,3 +2,4 @@ ejabberd-2_0_1-3_fc9:EL-5:ejabberd-2.0.1-3.fc9.src.rpm:1214151359
 ejabberd-2_0_1-4_fc9:EL-5:ejabberd-2.0.1-4.fc9.src.rpm:1214161435
 ejabberd-2_0_2-1_fc9:EL-5:ejabberd-2.0.2-1.fc9.src.rpm:1220041261
 ejabberd-2_0_2-3_fc9:EL-5:ejabberd-2.0.2-3.fc9.src.rpm:1222926241
+ejabberd-2_0_3-1_fc10:EL-5:ejabberd-2.0.3-1.fc10.src.rpm:1232988681
diff --git a/sources b/sources
index e51d308..9f3ef26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eef7ab12fc1e3ed34669bb2d5e1d0448  ejabberd-2.0.2.tar.gz
+b647e74b0f94f030bd8747c8a8a4d0f9  ejabberd-2.0.3.tar.gz