diff --git a/.cvsignore b/.cvsignore
index f10a021..ded620e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,3 +14,4 @@ system-config-bind-4.0.0-22_FC5.tar.gz
 system-config-bind-4.0.0-24_FC5.tar.gz
 system-config-bind-4.0.0-26_FC5.tar.gz
 system-config-bind-4.0.0-28_FC5.tar.gz
+system-config-bind-4.0.0-30_FC5.tar.gz
diff --git a/Makefile b/Makefile
index 5e6ac5d..8beb16a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for source rpm: system-config-bind
-# $Id: Makefile,v 1.3 2005/07/26 18:20:15 jvdias Exp $
+# $Id: Makefile,v 1.4 2005/08/15 22:20:59 jvdias Exp $
 NAME := system-config-bind
 SPECFILE = $(firstword $(wildcard *.spec))
 
@@ -7,6 +7,6 @@ include ../common/Makefile.common
 
 
 tar: 	
-	tar -cpf - system-config-bind-$(VERSION)/{Makefile,*.py,profiles,pixmaps,system-config-bind{.glade,.desktop.in,.console,.pam},scb_manual.{pdf,odt},po/{Makefile,*.po,*.pot},desktop.pot} | gzip >  system-config-bind-$(VERSION)-$(RELEASE).tar.gz
+	tar -cpf - system-config-bind-$(VERSION)/{Makefile,*.py,profiles/default/{named.conf,named/{localdomain.zone,localhost.zone,named.broadcast,named.ip6.local,named.local,named.zero}},pixmaps/*.png,system-config-bind{.glade,.desktop.in,.console,.pam},scb_manual.{pdf,odt},po/{Makefile,*.po,*.pot},desktop.pot} | gzip >  system-config-bind-$(VERSION)-$(RELEASE).tar.gz
 
 
diff --git a/sources b/sources
index 3836122..0c060f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fe45451c6da770271be8549b0ed1ed0  system-config-bind-4.0.0-28_FC5.tar.gz
+2749f15f37577df26ef26355987c4e69  system-config-bind-4.0.0-30_FC5.tar.gz
diff --git a/system-config-bind.spec b/system-config-bind.spec
index 63d96a3..afd9f01 100644
--- a/system-config-bind.spec
+++ b/system-config-bind.spec
@@ -1,7 +1,7 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.0
-Release: 	28_FC5
+Release: 	30_FC5
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://people.redhat.com/~jvdias/system-config-bind
@@ -36,7 +36,6 @@ make install      ROOT=%{buildroot}
 %find_lang %{name} || touch %{name}.lang;
 %find_lang bindconf || touch bindconf.lang;
 cat %{name}.lang bindconf.lang > scb.lang
-ln -s bindconf.pot $RPM_BUILD_ROOT/usr/share/system-config-bind/po/system-config-bind.pot
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,7 +79,23 @@ if [ "$1" -eq 0 ]; then
    fi;
 fi;
 
+%triggerin -n system-config-bind -- system-config-bind <= 4.0.0-28
+if [ "$2" -gt 0 ]; then
+#  remove some CVS directories that got included by mistake, which can cause
+#  "initializing from defaults" to fail
+   [ -d /usr/share/system-config-bind/profiles/CVS ] && /bin/rm -rf /usr/share/system-config-bind/profiles/CVS;	
+   [ -d /usr/share/system-config-bind/profiles/default/CVS ] && /bin/rm -rf /usr/share/system-config-bind/profiles/default/CVS;	
+   [ -d /usr/share/system-config-bind/profiles/default/named/CVS ] && /bin/rm -rf /usr/share/system-config-bind/profiles/default/named/CVS; 
+   :;
+fi
+
 %changelog
+* Mon Aug 15 2005 Jason Vas Dias <jvdias@redhat.com> - 4.0.0-30
+- fix IPv6 address labelling
+- fix reverse IP zone origin selection menus for A & AAAA records
+  when there are forwarder reverse IP zones
+- remove CVS directories mistakenly included in previous versions
+
 * Tue Aug 09 2005 Jason Vas Dias <jvdias@redhat.com> - 4.0.0-28
 - fix bug 165445: relax restriction on no address records for origin