diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index c8ef622..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-aiccu_2006.07.25.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5d6cc2a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+aiccu_20070115.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 22b1e54..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: aiccu
-# $Id$
-NAME := aiccu
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/aiccu-reload.patch b/aiccu-reload.patch
deleted file mode 100644
index 17ae30a..0000000
--- a/aiccu-reload.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- aiccu_2006.07.25/doc/aiccu.init.rpm.orig	2006-09-03 15:05:44.000000000 -0500
-+++ aiccu_2006.07.25/doc/aiccu.init.rpm	2006-09-03 15:05:59.000000000 -0500
-@@ -85,6 +85,8 @@ case "$1" in
-   	stop
- 	;;
-   restart)
-+	restart
-+	;;
-   reload)
-   	restart
- 	;;
diff --git a/aiccu.spec b/aiccu.spec
index 98f77f8..78e2a7c 100644
--- a/aiccu.spec
+++ b/aiccu.spec
@@ -8,15 +8,13 @@
 
 Summary:   AICCU - SixXS Automatic IPv6 Connectivity Client Utility
 Name:      aiccu
-Version:   2006.07.25
-Release:   2%{?dist}
-License:   BSDish
-Group:	   System Environment/Daemons
+Version:   2007.01.15
+Release:   1%{?dist}
+License:   BSD
+Group:     System Environment/Daemons
 URL:       http://www.sixxs.net/tools/aiccu/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source:    http://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_%{version}.tar.gz
-# upstream author acks this patch, will include in a future release
-Patch1:	   aiccu-reload.patch
+Source:    http://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_20070115.tar.gz
 BuildRequires: gnutls-devel
 Requires:  iproute
 Requires(post): chkconfig
@@ -32,7 +30,6 @@ For more information about SixXS check http://www.sixxs.net
 
 %prep
 %setup -q -n %{name}
-%patch1 -p1
 # fix executable permissions on non-executable content
 # so debuginfo can pick them up properly
 find . -type f -not -name rules -and -not -name *init* -exec chmod a-x \{\} \;
@@ -73,6 +70,20 @@ make clean
 %{_sysconfdir}/init.d/aiccu
 
 %changelog
+* Wed Jan 31 2007 Matt Domsch <matt@domsch.com> 2007.01.15-1
+- upgrade to latest upstream
+
+* Sat Jan 13 2007 Matt Domsch <matt@domsch.com> 2007.01.07-2
+- upstream respun their release with the same version number to fix AYIYA.
+
+* Sun Jan 07 2007 Matt Domsch <matt@domsch.com> 2007.01.07-1
+- upgrade to latest upstream 2007.01.07
+  - license change to BSD 3-clause
+  - Fixed up silly linux bug, adding LL address to tunnels but not to tun/taps.
+  - local_ipv4_override option so one can use AICCU behind a NAT that
+    has been configured correctly to do proto-41 forwarding. This is
+    usually called a DMZ setup.
+
 * Mon Oct 02 2006 Matt Domsch <matt@domsch.com> 2006.07.25-2
 - rebuilt
 
diff --git a/sources b/sources
index 50c08ea..66058a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0df76e92eb34f4ce8aa3cfcf6896f271  aiccu_2006.07.25.tar.gz
+c9bcc83644ed788e22a7c3f3d4021350  aiccu_20070115.tar.gz