diff --git a/PVE/API2/OpenVZ.pm b/PVE/API2/OpenVZ.pm
index 5ab37418..10d2f9be 100644
--- a/PVE/API2/OpenVZ.pm
+++ b/PVE/API2/OpenVZ.pm
@@ -349,6 +349,13 @@ __PACKAGE__->register_method({
 	    $param->{nameserver} = join(' ', @ns) if scalar(@ns);
 	}
 
+	# try to append domain to hostmane
+	if ($param->{hostname} && $param->{hostname} !~ m/\./ &&
+	    $param->{searchdomain}) {
+
+	    $param->{hostname} .= ".$param->{searchdomain}";
+	}
+
 	my $basecfg_fn = PVE::OpenVZ::config_file($vmid);
 
 	my $check_vmid_usage = sub {
diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index 82aae055..120f95a8 100644
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -1,3 +1,10 @@
+pve-manager (2.0-53) unstable; urgency=low
+
+  * fix bug #117: automatically add domain to hostname when creating
+    openvz containers.
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 29 Mar 2012 10:19:57 +0200
+
 pve-manager (2.0-52) unstable; urgency=low
 
   * fix Subscription code
diff --git a/defines.mk b/defines.mk
index e79347b5..49d1c1db 100644
--- a/defines.mk
+++ b/defines.mk
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=pve-manager
-PACKAGERELEASE=52
+PACKAGERELEASE=53
 
 BINDIR=${DESTDIR}/usr/bin
 PERLLIBDIR=${DESTDIR}/usr/share/perl5