diff --git a/patches/systemvm/debian/config/etc/logrotate.conf b/patches/systemvm/debian/config/etc/logrotate.conf
new file mode 100644
index 00000000000..f5a660964d3
--- /dev/null
+++ b/patches/systemvm/debian/config/etc/logrotate.conf
@@ -0,0 +1,37 @@
+# see "man logrotate" for details
+# rotate log files daily
+daily
+
+# keep 5 days worth
+rotate 5
+
+# create new (empty) log files after rotating old ones
+create
+
+# use date as a suffix of the rotated file
+dateext
+
+# uncomment this if you want your log files compressed
+#compress
+
+# max size 50M
+size 50M
+
+# RPM packages drop log rotation information into this directory
+include /etc/logrotate.d
+
+# no packages own wtmp and btmp -- we'll rotate them here
+/var/log/wtmp {
+    monthly
+    create 0664 root utmp
+    rotate 1
+}
+
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 1
+}
+
+# system-specific logs may be also be configured here.
diff --git a/patches/systemvm/debian/config/etc/logrotate.d/apache2 b/patches/systemvm/debian/config/etc/logrotate.d/apache2
new file mode 100644
index 00000000000..f2dd950bf26
--- /dev/null
+++ b/patches/systemvm/debian/config/etc/logrotate.d/apache2
@@ -0,0 +1,13 @@
+/var/log/apache2/*.log {
+	weekly
+	missingok
+	rotate 52
+	compress
+	delaycompress
+	notifempty
+	create 640 root adm
+	sharedscripts
+	postrotate
+		/etc/init.d/apache2 reload > /dev/null
+	endscript
+}
diff --git a/patches/systemvm/debian/config/etc/logrotate.d/dnsmasq b/patches/systemvm/debian/config/etc/logrotate.d/dnsmasq
new file mode 100644
index 00000000000..f448420e176
--- /dev/null
+++ b/patches/systemvm/debian/config/etc/logrotate.d/dnsmasq
@@ -0,0 +1,13 @@
+/var/log/dnsmasq.log {
+    daily
+    missingok
+    rotate 5
+    notifempty
+    delaycompress
+    sharedscripts
+    postrotate
+        [ ! -f /var/run/dnsmasq.pid ] || kill -USR2 `cat /var/run/dnsmasq.pid`
+    endscript
+    create 0640 nobody root
+}
+
diff --git a/patches/systemvm/debian/config/etc/logrotate.d/haproxy b/patches/systemvm/debian/config/etc/logrotate.d/haproxy
new file mode 100644
index 00000000000..858fe2a1c3a
--- /dev/null
+++ b/patches/systemvm/debian/config/etc/logrotate.d/haproxy
@@ -0,0 +1,10 @@
+/var/log/haproxy.log {
+    daily
+    rotate 5
+    missingok
+    notifempty
+    size 10M
+    postrotate  
+      /bin/kill -HUP `cat /var/run/rsyslog.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}
diff --git a/patches/systemvm/debian/config/etc/logrotate.d/ppp b/patches/systemvm/debian/config/etc/logrotate.d/ppp
new file mode 100644
index 00000000000..35054639a4d
--- /dev/null
+++ b/patches/systemvm/debian/config/etc/logrotate.d/ppp
@@ -0,0 +1,9 @@
+/var/log/ppp-connect-errors {
+	weekly
+	rotate 4
+	missingok
+	notifempty
+	compress
+	nocreate
+}
+
diff --git a/patches/systemvm/debian/config/etc/logrotate.d/rsyslog b/patches/systemvm/debian/config/etc/logrotate.d/rsyslog
new file mode 100644
index 00000000000..9ce5a447a43
--- /dev/null
+++ b/patches/systemvm/debian/config/etc/logrotate.d/rsyslog
@@ -0,0 +1,37 @@
+/var/log/syslog
+{
+	rotate 7
+	daily
+	missingok
+	notifempty
+	delaycompress
+	compress
+	postrotate
+		invoke-rc.d rsyslog reload > /dev/null
+	endscript
+}
+
+/var/log/mail.info
+/var/log/mail.warn
+/var/log/mail.err
+/var/log/mail.log
+/var/log/daemon.log
+/var/log/kern.log
+/var/log/auth.log
+/var/log/user.log
+/var/log/lpr.log
+/var/log/cron.log
+/var/log/debug
+/var/log/messages
+{
+	rotate 4
+	weekly
+	missingok
+	notifempty
+	compress
+	delaycompress
+	sharedscripts
+	postrotate
+		invoke-rc.d rsyslog reload > /dev/null
+	endscript
+}
diff --git a/patches/systemvm/debian/config/etc/rsyslog.conf b/patches/systemvm/debian/config/etc/rsyslog.conf
new file mode 100644
index 00000000000..8dc7c7504ca
--- /dev/null
+++ b/patches/systemvm/debian/config/etc/rsyslog.conf
@@ -0,0 +1,106 @@
+#  /etc/rsyslog.conf	Configuration file for rsyslog.
+#
+#			For more information see
+#			/usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
+
+
+#################
+#### MODULES ####
+#################
+
+$ModLoad imuxsock # provides support for local system logging
+$ModLoad imklog   # provides kernel logging support (previously done by rklogd)
+#$ModLoad immark  # provides --MARK-- message capability
+
+# provides UDP syslog reception
+$ModLoad imudp
+$UDPServerRun 3914
+
+# provides TCP syslog reception
+#$ModLoad imtcp
+#$InputTCPServerRun 514
+
+
+###########################
+#### GLOBAL DIRECTIVES ####
+###########################
+
+#
+# Use traditional timestamp format.
+# To enable high precision timestamps, comment out the following line.
+#
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+#
+# Set the default permissions for all log files.
+#
+$FileOwner root
+$FileGroup adm
+$FileCreateMode 0640
+$DirCreateMode 0755
+$Umask 0022
+
+#
+# Include all config files in /etc/rsyslog.d/
+#
+$IncludeConfig /etc/rsyslog.d/*.conf
+
+
+###############
+#### RULES ####
+###############
+
+#
+# First some standard log files.  Log by facility.
+#
+auth,authpriv.*			/var/log/auth.log
+#*.*;auth,authpriv.none		-/var/log/syslog
+cron.*				/var/log/cron.log
+daemon.*			-/var/log/daemon.log
+kern.*				-/var/log/kern.log
+lpr.*				-/var/log/lpr.log
+mail.*				-/var/log/mail.log
+#user.*				-/var/log/user.log
+
+#
+# Logging for the mail system.  Split it up so that
+# it is easy to write scripts to parse these files.
+#
+mail.info			-/var/log/mail.info
+mail.warn			-/var/log/mail.warn
+mail.err			/var/log/mail.err
+
+#
+# Logging for INN news system.
+#
+news.crit			/var/log/news/news.crit
+news.err			/var/log/news/news.err
+news.notice			-/var/log/news/news.notice
+
+#
+# Some "catch-all" log files.
+#
+#*.=debug;\
+#	auth,authpriv.none;\
+#	news.none;mail.none	-/var/log/debug
+*.=info;*.=notice;*.=warn;\
+	auth,authpriv.none;\
+	cron.none,daemon.none;\
+	local0.none,daemon.none;\
+	mail.none,news.none		-/var/log/messages
+
+#
+# Emergencies are sent to everybody logged in.
+#
+*.emerg				*
+
+#
+# I like to have messages displayed on the console, but only on a virtual
+# console I usually leave idle.
+#
+#daemon,mail.*;\
+#	news.=crit;news.=err;news.=notice;\
+#	*.=debug;*.=info;\
+#	*.=notice;*.=warn	/dev/tty8
+
+local0.*	-/var/log/haproxy.log
diff --git a/patches/systemvm/debian/convert.sh b/patches/systemvm/debian/convert.sh
index c3fe1c6c13d..3d7dac7f487 100755
--- a/patches/systemvm/debian/convert.sh
+++ b/patches/systemvm/debian/convert.sh
@@ -17,9 +17,13 @@ bzip2 -c systemvm.qcow2 > systemvm.qcow2.bz2
 echo "Done qcow2"
 echo "Converting raw image to vmdk"
 qemu-img  convert -f raw -O vmdk systemvm.img systemvm.vmdk
-echo "Compressing vmdk..."
-bzip2 -c systemvm.vmdk > systemvm.vmdk.bz2
-echo "Done vmdk"
+echo "Done creating vmdk"
+echo "Creating ova appliance "
+ovftool systemvm.vmx systemvm.ova
+echo "Done creating OVA"
+echo "Cleaning up..."
+rm -vf systemvm.vmdk
+rm -vf systemvm.vhd.bak
 
 echo "Compressing raw image..."
 bzip2 -c systemvm.img > systemvm.img.bz2
@@ -32,5 +36,4 @@ md5sum systemvm.vhd  >> md5sum
 md5sum systemvm.vhd.bz2  >> md5sum
 md5sum systemvm.qcow2  >> md5sum
 md5sum systemvm.qcow2.bz2  >> md5sum
-md5sum systemvm.vmdk  >> md5sum
-md5sum systemvm.vmdk.bz2  >> md5sum
+md5sum systemvm.ova  >> md5sum
diff --git a/patches/systemvm/debian/systemvm.vmx b/patches/systemvm/debian/systemvm.vmx
new file mode 100644
index 00000000000..9b93449d94a
--- /dev/null
+++ b/patches/systemvm/debian/systemvm.vmx
@@ -0,0 +1,37 @@
+config.version = "8"
+displayname = "systemvm"
+ethernet0.addressType = "generated"
+ethernet0.connectionType = "bridged"
+ethernet0.present = "true"
+ethernet0.startConnected = "true"
+ethernet0.virtualDev = "e1000"
+floppy0.autodetect = "false"
+floppy0.fileType = "device"
+floppy0.present = "true"
+floppy0.startConnected = "false"
+guestos = "debian5"
+ide0:0.deviceType = "disk"
+ide0:0.fileName = "systemvm.vmdk"
+ide0:0.present = "true"
+ide1:0.autodetect = "true"
+ide1:0.deviceType = "atapi-cdrom"
+ide1:0.present = "true"
+ide1:0.startConnected = "false"
+memsize = "256"
+numvcpus = "1"
+pciBridge0.present = "TRUE"
+pciBridge4.functions = "8"
+pciBridge4.present = "TRUE"
+pciBridge4.virtualDev = "pcieRootPort"
+pciBridge5.functions = "8"
+pciBridge5.present = "TRUE"
+pciBridge5.virtualDev = "pcieRootPort"
+pciBridge6.functions = "8"
+pciBridge6.present = "TRUE"
+pciBridge6.virtualDev = "pcieRootPort"
+pciBridge7.functions = "8"
+pciBridge7.present = "TRUE"
+pciBridge7.virtualDev = "pcieRootPort"
+svga.autodetect = "true"
+virtualhw.version = "7"
+vmci0.present = "TRUE"