diff --git a/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/debian/changelog b/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/debian/changelog
index ff55ef5..50b45f5 100644
--- a/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/debian/changelog
+++ b/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/debian/changelog
@@ -1,3 +1,9 @@
+univention-virtual-machine-manager-daemon (3.0.1-1) unstable; urgency=low
+
+  * Prevent snapshots of suspended VMs (Bug #23436)
+
+ -- Philipp Hahn <hahn@univention.de>  Tue, 09 Jul 2013 17:55:01 +0200
+
 univention-virtual-machine-manager-daemon (3.0.0-1) unstable; urgency=low
 
   * Bug #28260: use SearchSanitizer to prevent regex DoS
diff --git a/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/umc/js/de.po b/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/umc/js/de.po
index 0c412b4..48f7845 100644
--- a/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/umc/js/de.po
+++ b/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/umc/js/de.po
@@ -330,6 +330,13 @@ msgstr "Erstellen einer virtuellen Maschine"
 
 #: umc/js/uvmm/SnapshotGrid.js:
 msgid ""
+"Creating a snapshots is not possible, because the domain is currently suspended!"
+msgstr ""
+"Das Anlegen eines Sicherungspunktes ist nicht möglich, weil die Domain "
+"momentan 'gespeichert und beendet' ist!"
+
+#: umc/js/uvmm/SnapshotGrid.js:
+msgid ""
 "Creating a snapshot is not possible, because the domain does not have at "
 "least one qcow2 image!"
 msgstr ""
diff --git a/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/SnapshotGrid.js b/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/SnapshotGrid.js
index 5857d91..60a24f4 100644
--- a/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/SnapshotGrid.js
+++ b/branches/ucs-3.2/ucs-3.2-0/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/SnapshotGrid.js
@@ -95,6 +95,11 @@ define([
 		_addSnapshot: function() {
 			var _dialog = null, form = null;
 
+			if (this.domain.suspended) {
+					dialog.alert(_('Creating a snapshots is not possible, because the domain is currently suspended!'));
+					return;
+			}
+
 			var qcow2_images = 0;
 			var snapshots_possible = array.every(this.domain.disks, function(disk) {
 				if (!disk.source) {