diff --git a/pacemaker-Wno-cast-align.patch b/pacemaker-Wno-cast-align.patch
new file mode 100644
index 0000000..8d25cfd
--- /dev/null
+++ b/pacemaker-Wno-cast-align.patch
@@ -0,0 +1,13 @@
+Index: pacemaker/lib/common/Makefile.am
+===================================================================
+--- pacemaker.orig/lib/common/Makefile.am
++++ pacemaker/lib/common/Makefile.am
+@@ -32,6 +32,8 @@ lib_LTLIBRARIES	= libcrmcommon.la
+ 
+ CFLAGS		= $(CFLAGS_COPY:-Wcast-qual=) -fPIC
+ 
++ipc.lo remote.lo: CFLAGS += -Wno-cast-align
++
+ libcrmcommon_la_SOURCES	= ipc.c utils.c xml.c iso8601.c remote.c mainloop.c logging.c
+ if BUILD_CIBSECRETS
+ libcrmcommon_la_SOURCES	+= cib_secrets.c
diff --git a/pacemaker.changes b/pacemaker.changes
index a20c55c..386d23f 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 22 15:03:31 UTC 2013 - schwab@suse.de
+
+- Disable -Wcast-align on problematic files
+
 -------------------------------------------------------------------
 Tue Oct 22 10:50:29 UTC 2013 - ygao@suse.com
 
diff --git a/pacemaker.spec b/pacemaker.spec
index 3d9c484..38d59b3 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -28,9 +28,9 @@
 # Needed so that the -devel package is multilib compliant
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 
-#%global rawhide  %(test ! -e /etc/yum.repos.d/fedora-rawhide.repo; echo $?)
+#%%global rawhide  %%(test ! -e /etc/yum.repos.d/fedora-rawhide.repo; echo $?)
 %global rawhide  0
-#%global cs_version %(pkg-config corosync --modversion  | awk -F . '{print $1}')
+#%%global cs_version %%(pkg-config corosync --modversion  | awk -F . '{print $1}')
 %global cs_version 2
 %global py_site %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
 
@@ -114,6 +114,7 @@ Patch7:         pacemaker-nagios-plugin-dir.patch
 Patch8:         bug-812269_pacemaker-fencing-update-cib.patch
 Patch9:         bug-800323_pacemaker-crm_mon-save-cib.patch
 Patch10:        bug-812269_pacemaker-fencing-device-register-messages.patch
+Patch11:        pacemaker-Wno-cast-align.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       pacemaker-ticket-support = 2.0
 Conflicts:      heartbeat < 3.0
@@ -400,6 +401,7 @@ manager for Corosync, CMAN and/or Linux-HA.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 # Force the local time
 #