diff --git a/tgt.changes b/tgt.changes
index 2423edc..3ce9a0e 100644
--- a/tgt.changes
+++ b/tgt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 11 10:36:23 PDT 2013 - lduncan@suse.com
+
+- Renamed firewall service file from iscsitarget to tgt
+  to remove conflict with tgt package (bnc#814364)
+
 -------------------------------------------------------------------
 Fri Oct 26 01:14:03 UTC 2012 - lduncan@suse.com
 
diff --git a/tgt.spec b/tgt.spec
index 14367f2..7a3c4e0 100644
--- a/tgt.spec
+++ b/tgt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tgt
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -73,7 +73,7 @@ Authors:
 %{__make} DESTDIR=${RPM_BUILD_ROOT} docdir=%_docdir/%{name} install
 install -vD -m 755 %{S:1} ${RPM_BUILD_ROOT}/etc/init.d/tgtd
 ln -sf /etc/init.d/tgtd ${RPM_BUILD_ROOT}/usr/sbin/rctgtd
-install -vD %{S:3} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/iscsitarget
+install -vD %{S:3} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/tgt
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -96,7 +96,7 @@ rm -f filelist
 %dir /etc/tgt/examples
 %config %attr(0644,root,root) /etc/tgt/targets.conf
 %config %attr(0644,root,root) /etc/tgt/examples/*
-%config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/iscsitarget
+%config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/tgt
 %doc README doc/README.iscsi doc/README.iser doc/README.lu_configuration
 %doc doc/README.mmc doc/README.passthrough doc/README.sbcjukebox doc/README.ssc
 %doc %{_mandir}/man8/*