diff --git a/aircrack-ng/Makefile b/aircrack-ng/Makefile
index ae8900beb9..32a1f917f1 100644
--- a/aircrack-ng/Makefile
+++ b/aircrack-ng/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2008/12/04 22:49:51 tnn2 Exp $
+# $NetBSD: Makefile,v 1.7 2009/03/21 18:58:45 tnn2 Exp $
 #
 
-DISTNAME=		aircrack-ng-1.0-rc1
-PKGNAME=		aircrack-ng-1.0rc1
+DISTNAME=		aircrack-ng-1.0-rc2
+PKGNAME=		aircrack-ng-1.0rc2
 CATEGORIES=		security
 MASTER_SITES=		http://download.aircrack-ng.org/
 
diff --git a/aircrack-ng/PLIST b/aircrack-ng/PLIST
index 99729aa150..741eb741c4 100644
--- a/aircrack-ng/PLIST
+++ b/aircrack-ng/PLIST
@@ -1,19 +1,21 @@
-@comment $NetBSD: PLIST,v 1.4 2008/12/04 22:49:51 tnn2 Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/03/21 18:58:45 tnn2 Exp $
 bin/aircrack-ng
 bin/airdecap-ng
+bin/airdecloak-ng
 bin/buddy-ng
 bin/ivstools
 bin/kstats
 bin/makeivs-ng
 bin/packetforge-ng
+man/man1/airbase-ng.1
 man/man1/aircrack-ng.1
 man/man1/airdecap-ng.1
+man/man1/airdecloak-ng.1
 man/man1/airdriver-ng.1
 man/man1/aireplay-ng.1
 man/man1/airmon-ng.1
 man/man1/airodump-ng.1
-man/man1/airolib-ng.1
-man/man1/airsev-ng.1
+man/man1/airserv-ng.1
 man/man1/airtun-ng.1
 man/man1/buddy-ng.1
 man/man1/easside-ng.1
@@ -21,6 +23,7 @@ man/man1/ivstools.1
 man/man1/kstats.1
 man/man1/makeivs-ng.1
 man/man1/packetforge-ng.1
+man/man1/tkiptun-ng.1
 man/man1/wesside-ng.1
 sbin/airbase-ng
 sbin/airdriver-ng
@@ -30,5 +33,5 @@ sbin/airodump-ng
 sbin/airserv-ng
 sbin/airtun-ng
 sbin/easside-ng
-sbin/patchchk
+sbin/tkiptun-ng
 sbin/wesside-ng
diff --git a/aircrack-ng/distinfo b/aircrack-ng/distinfo
index 7511e2db83..5a222a4df0 100644
--- a/aircrack-ng/distinfo
+++ b/aircrack-ng/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2008/12/04 22:49:51 tnn2 Exp $
+$NetBSD: distinfo,v 1.8 2009/03/21 18:58:45 tnn2 Exp $
 
-SHA1 (aircrack-ng-1.0-rc1.tar.gz) = e17606ae47b4baa2c1d5751d117ebe11924cba29
-RMD160 (aircrack-ng-1.0-rc1.tar.gz) = e9805870c27119c06a1069c50bfea5e228eab847
-Size (aircrack-ng-1.0-rc1.tar.gz) = 1208442 bytes
-SHA1 (patch-aa) = 47f072632d05e1b2f55d965512eb352175064908
+SHA1 (aircrack-ng-1.0-rc2.tar.gz) = 67c512d9e48dce2aab4f5523ad2380a676d75a4a
+RMD160 (aircrack-ng-1.0-rc2.tar.gz) = aa96e5d3210f0c0dbc48f15744e8831ffb61dba3
+Size (aircrack-ng-1.0-rc2.tar.gz) = 1472691 bytes
+SHA1 (patch-aa) = c50058d25fb9851355f2a1e3b6e136b3b6d2041d
 SHA1 (patch-ab) = 1a67067abbf87f60f5b5612e8450034f4b670bf5
 SHA1 (patch-ac) = 3990d03db26ffa1fbd2f8e13c1715bac76ba70ec
diff --git a/aircrack-ng/patches/patch-aa b/aircrack-ng/patches/patch-aa
index 4421ed55b3..a131893caf 100644
--- a/aircrack-ng/patches/patch-aa
+++ b/aircrack-ng/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.4 2008/12/04 22:49:51 tnn2 Exp $
+$NetBSD: patch-aa,v 1.5 2009/03/21 18:58:45 tnn2 Exp $
 
---- src/osdep/network.c.orig	2008-06-09 21:55:09.000000000 +0200
+--- src/osdep/network.c.orig	2009-01-22 23:52:20.000000000 +0100
 +++ src/osdep/network.c
-@@ -32,10 +32,24 @@
- 
- #ifdef __MACH__ 
+@@ -34,10 +34,23 @@
  #include <libkern/OSByteOrder.h>
+ #elif defined (__sun) && defined (__sparc) /* Solaris SPARC, not Solaris x86 */
+ #include <sys/byteorder.h>
 -#else
 +#elif defined(__linux__)
  #include <asm/byteorder.h>
@@ -24,7 +24,6 @@ $NetBSD: patch-aa,v 1.4 2008/12/04 22:49:51 tnn2 Exp $
 +#define __be32_to_cpu(x) bswap32(x)
 +#endif
 +#endif
-+
+ 
  #include "osdep.h"
  #include "network.h"
-