diff --git a/SOURCES/bz1218478-fix-cluster-property-name-validation.patch b/SOURCES/bz1218478-fix-cluster-property-name-validation.patch
new file mode 100644
index 0000000..274470b
--- /dev/null
+++ b/SOURCES/bz1218478-fix-cluster-property-name-validation.patch
@@ -0,0 +1,28 @@
+From 289af7fd608a67d02494859302e465f19bb269bd Mon Sep 17 00:00:00 2001
+From: Tomas Jelinek <tojeline@redhat.com>
+Date: Thu, 7 May 2015 13:15:55 +0200
+Subject: [PATCH] fix cluster property name validation
+
+---
+ pcs/prop.py                 | 5 ++---
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/pcs/prop.py b/pcs/prop.py
+index 3b1c15a..6d99032 100644
+--- a/pcs/prop.py
++++ b/pcs/prop.py
+@@ -32,9 +32,8 @@ def set_property(argv):
+         if "--node" in utils.pcs_options:
+             utils.set_node_attribute(args[0], args[1], utils.pcs_options["--node"])
+         elif ("--force" in utils.pcs_options) or utils.is_valid_property(args[0]):
+-            id_valid, id_error = utils.validate_xml_id(args[0], 'property name')
+-            if not id_valid:
+-                utils.err(id_error)
++            if not args[0]:
++                utils.err("property name cannot be empty")
+             utils.set_cib_property(args[0],args[1])
+         else:
+             utils.err("unknown cluster property: '%s', (use --force to override)" % args[0])
+-- 
+1.9.1
+
diff --git a/SPECS/pcs.spec b/SPECS/pcs.spec
index f0f6250..dee54e8 100644
--- a/SPECS/pcs.spec
+++ b/SPECS/pcs.spec
@@ -16,7 +16,7 @@
 
 Name: pcs		
 Version: 0.9.137
-Release: 13%{?dist}.2
+Release: 13%{?dist}.3
 License: GPLv2
 URL: http://github.com/feist/pcs
 Group: System Environment/Base
@@ -39,6 +39,7 @@ Patch10: bz1180506-Warn-if-nodes-stop-will-cause-a-loss-of-the-quorum.patch
 Patch11: bz1180506-3-Keep-cluster-quorate-during-destruction-as-long-as-possible.patch
 Patch12: bz1205848-Do-not-set-two_node-in-corosync-if-auto_tie_breaker-is-on.patch
 Patch13: secure-cookie.patch
+Patch14: bz1218478-fix-cluster-property-name-validation.patch
 
 # NOTE: Source20 and Patch200+ belong to python-clufter
 
@@ -236,6 +237,10 @@ popd >/dev/null
 
 
 %changelog
+* Wed Jun 10 2015 Tomas Jelinek <tojeline@redhat.com> - 0.9.137-13.el7_1.3
+- Fixed cluster property name validation
+- Resolves: rhbz#1229868
+
 * Wed Apr 15 2015 Tomas Jelinek <tojeline@redhat.com> - 0.9.137-13.el7_1.2
 - Fixes issues with cookie signing in pcsd
 - Resolves: rhbz#1211567