diff --git a/SuSEfirewall2.dhcp-server b/SuSEfirewall2.dhcp-server
index 640417d..5b77b26 100644
--- a/SuSEfirewall2.dhcp-server
+++ b/SuSEfirewall2.dhcp-server
@@ -1,5 +1,5 @@
 ## Name: DHCPv4 Server
-## Description: Opens ports for ISC DHCPv4 4.x Server.
+## Description: Opens ports for DHCPv4 Server.
 #
 # For a more detailed description of the individual variables see
 # the comments for FW_SERVICES_*_EXT in /etc/sysconfig/SuSEfirewall2
diff --git a/SuSEfirewall2.dhcp6-server b/SuSEfirewall2.dhcp6-server
new file mode 100644
index 0000000..36b0a2f
--- /dev/null
+++ b/SuSEfirewall2.dhcp6-server
@@ -0,0 +1,22 @@
+## Name: DHCPv6 Server
+## Description: Opens UDP port for DHCPv6 Server.
+#
+# For a more detailed description of the individual variables see
+# the comments for FW_SERVICES_*_EXT in /etc/sysconfig/SuSEfirewall2
+#
+
+# space separated list of allowed TCP ports
+TCP=""
+
+# space separated list of allowed UDP ports
+UDP="dhcpv6-server"
+
+# space separated list of allowed RPC services
+RPC=""
+
+# space separated list of allowed IP protocols
+IP=""
+
+# space separated list of allowed UDP broadcast ports
+BROADCAST=""
+
diff --git a/dhcp.changes b/dhcp.changes
index 5978885..8ac1996 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 12 15:17:19 UTC 2013 - mt@suse.com
+
+- Added dhcp6-server service template for SuSEfirewall2 (bnc#783002)
+
 -------------------------------------------------------------------
 Sun Mar  3 21:54:38 UTC 2013 - schwab@suse.de
 
diff --git a/dhcp.spec b/dhcp.spec
index a3e0612..1a7f902 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -64,6 +64,7 @@ Source24:       dhclient-script
 Source30:       dhcpd.xml
 Source31:       dhcpd6.xml
 Source32:       SuSEfirewall2.dhcp-server
+Source33:       SuSEfirewall2.dhcp6-server
 #
 Source40:       dhcp.LIESMICH
 Source41:       dhcp.README
@@ -368,6 +369,8 @@ install    -m0644 $RPM_SOURCE_DIR/dhcpd.xml                 \
                   $RPM_BUILD_ROOT/%{omc_svcdir}/
 install    -m0644 $RPM_SOURCE_DIR/SuSEfirewall2.dhcp-server \
                   $RPM_BUILD_ROOT/%{susefw2dir}/dhcp-server
+install    -m0644 $RPM_SOURCE_DIR/SuSEfirewall2.dhcp6-server \
+                  $RPM_BUILD_ROOT/%{susefw2dir}/dhcp6-server
 install -d -m0755 $RPM_BUILD_ROOT/etc/sysconfig/network/if-up.d
 install -d -m0755 $RPM_BUILD_ROOT/etc/sysconfig/network/scripts
 install    -m0755 $RPM_SOURCE_DIR/if-up.d.dhcpd-restart-hook \
@@ -445,6 +448,7 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
 %files
 %defattr(-,root,root)
 %config %{susefw2dir}/dhcp-server
+%config %{susefw2dir}/dhcp6-server
 %{_bindir}/omshell
 %doc %{_mandir}/man1/omshell.1.gz
 %doc %{_mandir}/man5/dhcp-eval.5.gz