diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index ec3bd22bfa3b..9a3b5fa396f8 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	2.0.5
+PORTVERSION=	2.0.7
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
diff --git a/security/fwbuilder-devel/distinfo b/security/fwbuilder-devel/distinfo
index 23b0751c001e..4c03d7b83acf 100644
--- a/security/fwbuilder-devel/distinfo
+++ b/security/fwbuilder-devel/distinfo
@@ -1 +1 @@
-MD5 (fwbuilder-2.0.5.tar.gz) = 03fe6aaa6f8c7728bd3015a4df187c70
+MD5 (fwbuilder-2.0.7.tar.gz) = e381567247165bb4a8a9a130d3abe446
diff --git a/security/fwbuilder-devel/files/patch-aa b/security/fwbuilder-devel/files/patch-aa
index 8fb67188dfc8..c4d56a641e17 100644
--- a/security/fwbuilder-devel/files/patch-aa
+++ b/security/fwbuilder-devel/files/patch-aa
@@ -1,9 +1,10 @@
---- qmake.inc.in.old	Sat Oct 16 23:56:08 2004
-+++ qmake.inc.in	Sat Oct 16 23:56:20 2004
-@@ -37,10 +37,6 @@
+--- qmake.inc.in.linux	2005-04-27 19:17:10.000000000 -0700
++++ qmake.inc.in	2005-04-27 19:17:38.000000000 -0700
+@@ -33,11 +33,6 @@
+ 	LIBS                   += $$LIBS_FWBUILDER
  
  	PKGLOCALEDIR            = $$res.path/locale
- 
+-
 -	QMAKE_CFLAGS_DEBUG     += -Wno-unused-parameter
 -	QMAKE_CFLAGS_RELEASE   += -Wno-unused-parameter
 -	QMAKE_CXXFLAGS_DEBUG   += -Wno-unused-parameter
diff --git a/security/fwbuilder-devel/files/patch-ab b/security/fwbuilder-devel/files/patch-ab
deleted file mode 100644
index ad8c73d9bcdb..000000000000
--- a/security/fwbuilder-devel/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/utils.cpp.old	Sun Oct 17 00:13:41 2004
-+++ src/gui/utils.cpp	Sun Oct 17 00:14:26 2004
-@@ -218,7 +218,7 @@
-     int sn1  = file.findRev('/',-1);
-     int sn2  = file.findRev('\\',-1);
-     int sn   = (sn1>=0)?sn1:sn2;
--    QString dir = (sn<0) ? "./" : file.left( sn );
-+    QString dir = (sn<0) ? QString("./") : file.left( sn );
- 
- #ifdef _WIN32
- /* on windows, if directory is in the root of the drive (like "c:"),
diff --git a/security/fwbuilder-devel/files/patch-ac b/security/fwbuilder-devel/files/patch-ac
deleted file mode 100644
index 12e05cb7ad36..000000000000
--- a/security/fwbuilder-devel/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/FWBTree.cpp.old	Sun Oct 17 00:16:10 2004
-+++ src/gui/FWBTree.cpp	Sun Oct 17 00:17:21 2004
-@@ -51,6 +51,7 @@
- #include "fwbuilder/IntervalGroup.h"
- 
- #include <iostream>
-+#include <algorithm>
- 
- using namespace std;
- using namespace libfwbuilder;
diff --git a/security/fwbuilder-devel/files/patch-ad b/security/fwbuilder-devel/files/patch-ad
deleted file mode 100644
index b4d5ff617560..000000000000
--- a/security/fwbuilder-devel/files/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/ObjectManipulator.cpp.old	Sun Oct 17 00:19:22 2004
-+++ src/gui/ObjectManipulator.cpp	Sun Oct 17 00:19:41 2004
-@@ -97,6 +97,7 @@
- #include "fwbuilder/IntervalGroup.h"
- 
- #include <iostream>
-+#include <algorithm>
- 
- using namespace std;
- using namespace libfwbuilder;
diff --git a/security/fwbuilder-devel/files/patch-ae b/security/fwbuilder-devel/files/patch-ae
deleted file mode 100644
index ec5432747d90..000000000000
--- a/security/fwbuilder-devel/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/listOfLibraries.cpp.old	Sun Oct 17 00:23:48 2004
-+++ src/gui/listOfLibraries.cpp	Sun Oct 17 00:24:01 2004
-@@ -38,6 +38,7 @@
- #include <qfile.h>
- 
- #include <iostream>
-+#include <algorithm>
- 
- using namespace std;
- using namespace libfwbuilder;
diff --git a/security/fwbuilder-devel/pkg-plist b/security/fwbuilder-devel/pkg-plist
index 51e1f498a193..2d976af6a598 100644
--- a/security/fwbuilder-devel/pkg-plist
+++ b/security/fwbuilder-devel/pkg-plist
@@ -28,6 +28,10 @@ bin/fwbuilder
 %%DOCSDIR%%/ReleaseNotes_2.0.4.txt
 %%DOCSDIR%%/ReleaseNotes_2.0.5.html
 %%DOCSDIR%%/ReleaseNotes_2.0.5.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.6.html
+%%DOCSDIR%%/ReleaseNotes_2.0.6.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.7.html
+%%DOCSDIR%%/ReleaseNotes_2.0.7.txt
 %%DOCSDIR%%/PatchAcceptancePolicy.txt
 %%DATADIR%%/objects_init.xml
 %%DATADIR%%/templates.xml
@@ -46,6 +50,7 @@ bin/fwbuilder
 %%DATADIR%%/os/solaris.xml
 %%DATADIR%%/os/pix_os.xml
 %%DATADIR%%/os/unknown_os.xml
+%%DATADIR%%/locale/fwbuilder_de.qm
 %%DATADIR%%/locale/fwbuilder_fr.qm
 %%DATADIR%%/locale/fwbuilder_ja.qm
 %%DATADIR%%/locale/fwbuilder_ru.qm
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index ec3bd22bfa3b..9a3b5fa396f8 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	2.0.5
+PORTVERSION=	2.0.7
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 23b0751c001e..4c03d7b83acf 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1 +1 @@
-MD5 (fwbuilder-2.0.5.tar.gz) = 03fe6aaa6f8c7728bd3015a4df187c70
+MD5 (fwbuilder-2.0.7.tar.gz) = e381567247165bb4a8a9a130d3abe446
diff --git a/security/fwbuilder/files/patch-aa b/security/fwbuilder/files/patch-aa
index 8fb67188dfc8..c4d56a641e17 100644
--- a/security/fwbuilder/files/patch-aa
+++ b/security/fwbuilder/files/patch-aa
@@ -1,9 +1,10 @@
---- qmake.inc.in.old	Sat Oct 16 23:56:08 2004
-+++ qmake.inc.in	Sat Oct 16 23:56:20 2004
-@@ -37,10 +37,6 @@
+--- qmake.inc.in.linux	2005-04-27 19:17:10.000000000 -0700
++++ qmake.inc.in	2005-04-27 19:17:38.000000000 -0700
+@@ -33,11 +33,6 @@
+ 	LIBS                   += $$LIBS_FWBUILDER
  
  	PKGLOCALEDIR            = $$res.path/locale
- 
+-
 -	QMAKE_CFLAGS_DEBUG     += -Wno-unused-parameter
 -	QMAKE_CFLAGS_RELEASE   += -Wno-unused-parameter
 -	QMAKE_CXXFLAGS_DEBUG   += -Wno-unused-parameter
diff --git a/security/fwbuilder/files/patch-ab b/security/fwbuilder/files/patch-ab
deleted file mode 100644
index ad8c73d9bcdb..000000000000
--- a/security/fwbuilder/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/utils.cpp.old	Sun Oct 17 00:13:41 2004
-+++ src/gui/utils.cpp	Sun Oct 17 00:14:26 2004
-@@ -218,7 +218,7 @@
-     int sn1  = file.findRev('/',-1);
-     int sn2  = file.findRev('\\',-1);
-     int sn   = (sn1>=0)?sn1:sn2;
--    QString dir = (sn<0) ? "./" : file.left( sn );
-+    QString dir = (sn<0) ? QString("./") : file.left( sn );
- 
- #ifdef _WIN32
- /* on windows, if directory is in the root of the drive (like "c:"),
diff --git a/security/fwbuilder/files/patch-ac b/security/fwbuilder/files/patch-ac
deleted file mode 100644
index 12e05cb7ad36..000000000000
--- a/security/fwbuilder/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/FWBTree.cpp.old	Sun Oct 17 00:16:10 2004
-+++ src/gui/FWBTree.cpp	Sun Oct 17 00:17:21 2004
-@@ -51,6 +51,7 @@
- #include "fwbuilder/IntervalGroup.h"
- 
- #include <iostream>
-+#include <algorithm>
- 
- using namespace std;
- using namespace libfwbuilder;
diff --git a/security/fwbuilder/files/patch-ad b/security/fwbuilder/files/patch-ad
deleted file mode 100644
index b4d5ff617560..000000000000
--- a/security/fwbuilder/files/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/ObjectManipulator.cpp.old	Sun Oct 17 00:19:22 2004
-+++ src/gui/ObjectManipulator.cpp	Sun Oct 17 00:19:41 2004
-@@ -97,6 +97,7 @@
- #include "fwbuilder/IntervalGroup.h"
- 
- #include <iostream>
-+#include <algorithm>
- 
- using namespace std;
- using namespace libfwbuilder;
diff --git a/security/fwbuilder/files/patch-ae b/security/fwbuilder/files/patch-ae
deleted file mode 100644
index ec5432747d90..000000000000
--- a/security/fwbuilder/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/listOfLibraries.cpp.old	Sun Oct 17 00:23:48 2004
-+++ src/gui/listOfLibraries.cpp	Sun Oct 17 00:24:01 2004
-@@ -38,6 +38,7 @@
- #include <qfile.h>
- 
- #include <iostream>
-+#include <algorithm>
- 
- using namespace std;
- using namespace libfwbuilder;
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
index 51e1f498a193..2d976af6a598 100644
--- a/security/fwbuilder/pkg-plist
+++ b/security/fwbuilder/pkg-plist
@@ -28,6 +28,10 @@ bin/fwbuilder
 %%DOCSDIR%%/ReleaseNotes_2.0.4.txt
 %%DOCSDIR%%/ReleaseNotes_2.0.5.html
 %%DOCSDIR%%/ReleaseNotes_2.0.5.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.6.html
+%%DOCSDIR%%/ReleaseNotes_2.0.6.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.7.html
+%%DOCSDIR%%/ReleaseNotes_2.0.7.txt
 %%DOCSDIR%%/PatchAcceptancePolicy.txt
 %%DATADIR%%/objects_init.xml
 %%DATADIR%%/templates.xml
@@ -46,6 +50,7 @@ bin/fwbuilder
 %%DATADIR%%/os/solaris.xml
 %%DATADIR%%/os/pix_os.xml
 %%DATADIR%%/os/unknown_os.xml
+%%DATADIR%%/locale/fwbuilder_de.qm
 %%DATADIR%%/locale/fwbuilder_fr.qm
 %%DATADIR%%/locale/fwbuilder_ja.qm
 %%DATADIR%%/locale/fwbuilder_ru.qm
diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
index ec3bd22bfa3b..9a3b5fa396f8 100644
--- a/security/fwbuilder2/Makefile
+++ b/security/fwbuilder2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	2.0.5
+PORTVERSION=	2.0.7
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
diff --git a/security/fwbuilder2/distinfo b/security/fwbuilder2/distinfo
index 23b0751c001e..4c03d7b83acf 100644
--- a/security/fwbuilder2/distinfo
+++ b/security/fwbuilder2/distinfo
@@ -1 +1 @@
-MD5 (fwbuilder-2.0.5.tar.gz) = 03fe6aaa6f8c7728bd3015a4df187c70
+MD5 (fwbuilder-2.0.7.tar.gz) = e381567247165bb4a8a9a130d3abe446
diff --git a/security/fwbuilder2/files/patch-aa b/security/fwbuilder2/files/patch-aa
index 8fb67188dfc8..c4d56a641e17 100644
--- a/security/fwbuilder2/files/patch-aa
+++ b/security/fwbuilder2/files/patch-aa
@@ -1,9 +1,10 @@
---- qmake.inc.in.old	Sat Oct 16 23:56:08 2004
-+++ qmake.inc.in	Sat Oct 16 23:56:20 2004
-@@ -37,10 +37,6 @@
+--- qmake.inc.in.linux	2005-04-27 19:17:10.000000000 -0700
++++ qmake.inc.in	2005-04-27 19:17:38.000000000 -0700
+@@ -33,11 +33,6 @@
+ 	LIBS                   += $$LIBS_FWBUILDER
  
  	PKGLOCALEDIR            = $$res.path/locale
- 
+-
 -	QMAKE_CFLAGS_DEBUG     += -Wno-unused-parameter
 -	QMAKE_CFLAGS_RELEASE   += -Wno-unused-parameter
 -	QMAKE_CXXFLAGS_DEBUG   += -Wno-unused-parameter
diff --git a/security/fwbuilder2/files/patch-ab b/security/fwbuilder2/files/patch-ab
deleted file mode 100644
index ad8c73d9bcdb..000000000000
--- a/security/fwbuilder2/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/utils.cpp.old	Sun Oct 17 00:13:41 2004
-+++ src/gui/utils.cpp	Sun Oct 17 00:14:26 2004
-@@ -218,7 +218,7 @@
-     int sn1  = file.findRev('/',-1);
-     int sn2  = file.findRev('\\',-1);
-     int sn   = (sn1>=0)?sn1:sn2;
--    QString dir = (sn<0) ? "./" : file.left( sn );
-+    QString dir = (sn<0) ? QString("./") : file.left( sn );
- 
- #ifdef _WIN32
- /* on windows, if directory is in the root of the drive (like "c:"),
diff --git a/security/fwbuilder2/files/patch-ac b/security/fwbuilder2/files/patch-ac
deleted file mode 100644
index 12e05cb7ad36..000000000000
--- a/security/fwbuilder2/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/FWBTree.cpp.old	Sun Oct 17 00:16:10 2004
-+++ src/gui/FWBTree.cpp	Sun Oct 17 00:17:21 2004
-@@ -51,6 +51,7 @@
- #include "fwbuilder/IntervalGroup.h"
- 
- #include <iostream>
-+#include <algorithm>
- 
- using namespace std;
- using namespace libfwbuilder;
diff --git a/security/fwbuilder2/files/patch-ad b/security/fwbuilder2/files/patch-ad
deleted file mode 100644
index b4d5ff617560..000000000000
--- a/security/fwbuilder2/files/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/ObjectManipulator.cpp.old	Sun Oct 17 00:19:22 2004
-+++ src/gui/ObjectManipulator.cpp	Sun Oct 17 00:19:41 2004
-@@ -97,6 +97,7 @@
- #include "fwbuilder/IntervalGroup.h"
- 
- #include <iostream>
-+#include <algorithm>
- 
- using namespace std;
- using namespace libfwbuilder;
diff --git a/security/fwbuilder2/files/patch-ae b/security/fwbuilder2/files/patch-ae
deleted file mode 100644
index ec5432747d90..000000000000
--- a/security/fwbuilder2/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/listOfLibraries.cpp.old	Sun Oct 17 00:23:48 2004
-+++ src/gui/listOfLibraries.cpp	Sun Oct 17 00:24:01 2004
-@@ -38,6 +38,7 @@
- #include <qfile.h>
- 
- #include <iostream>
-+#include <algorithm>
- 
- using namespace std;
- using namespace libfwbuilder;
diff --git a/security/fwbuilder2/pkg-plist b/security/fwbuilder2/pkg-plist
index 51e1f498a193..2d976af6a598 100644
--- a/security/fwbuilder2/pkg-plist
+++ b/security/fwbuilder2/pkg-plist
@@ -28,6 +28,10 @@ bin/fwbuilder
 %%DOCSDIR%%/ReleaseNotes_2.0.4.txt
 %%DOCSDIR%%/ReleaseNotes_2.0.5.html
 %%DOCSDIR%%/ReleaseNotes_2.0.5.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.6.html
+%%DOCSDIR%%/ReleaseNotes_2.0.6.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.7.html
+%%DOCSDIR%%/ReleaseNotes_2.0.7.txt
 %%DOCSDIR%%/PatchAcceptancePolicy.txt
 %%DATADIR%%/objects_init.xml
 %%DATADIR%%/templates.xml
@@ -46,6 +50,7 @@ bin/fwbuilder
 %%DATADIR%%/os/solaris.xml
 %%DATADIR%%/os/pix_os.xml
 %%DATADIR%%/os/unknown_os.xml
+%%DATADIR%%/locale/fwbuilder_de.qm
 %%DATADIR%%/locale/fwbuilder_fr.qm
 %%DATADIR%%/locale/fwbuilder_ja.qm
 %%DATADIR%%/locale/fwbuilder_ru.qm