diff --git a/net-mgmt/airport/Makefile b/net-mgmt/airport/Makefile
index c6f4f0040da1..ffb6585bcfa9 100644
--- a/net-mgmt/airport/Makefile
+++ b/net-mgmt/airport/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	airport
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	http://edge.mcs.drexel.edu/GICL/people/sevy/airport/
 DISTFILES=	configurator_${PORTVERSION:S/.//}${EXTRACT_SUFX}
@@ -30,8 +31,12 @@ NO_BUILD=	yes
 
 do-install:
 	@cd ${WRKSRC}; \
-		${MKDIR} ${PREFIX}/share/airport; \
-		${CP} -r ${WRKSRC}/* ${PREFIX}/share/airport; \
+		${MKDIR} ${PREFIX}/share/doc/airport/helpdocs; \
+		${MKDIR} ${PREFIX}/share/java; \
+		${INSTALL_DATA} ${WRKSRC}/*jar ${PREFIX}/share/java; \
+		${CP} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/airport; \
+		${CP} ${WRKSRC}/COPYING ${PREFIX}/share/doc/airport; \
+		${CP} -r ${WRKSRC}/helpdocs/* ${PREFIX}/share/doc/airport/helpdocs; \
 		${SED} \
 			-e s,%%PREFIX%%,${PREFIX},g \
 			-e s/%%JFC_VERSION%%/${JFC_VERSION}/ \
diff --git a/net-mgmt/airport/files/airport b/net-mgmt/airport/files/airport
index 5c8303d602b7..2ae406c629cb 100644
--- a/net-mgmt/airport/files/airport
+++ b/net-mgmt/airport/files/airport
@@ -1,9 +1,9 @@
 #! /bin/sh
 
 # Use this one for JDK 1.2 and beyond:
-# exec %%PREFIX%%/bin/javavm -jar %%PREFIX%%/share/airport/AirportBaseStationConfig.jar
+# exec %%PREFIX%%/bin/javavm -jar %%PREFIX%%/share/java/AirportBaseStationConfig.jar
 
 # Use this one for the default installation -- JDK 1.1.x + JFC:
-exec %%PREFIX%%/bin/javavm -classpath "%%PREFIX%%/jdk%%JDK_VERSION%%/lib/classes.zip:%%PREFIX%%/share/java/classes/jfc-%%JFC_VERSION%%/swingall.jar:%%PREFIX%%/share/airport/AirportBaseStationConfig.jar" AirportBaseStationConfigurator
+exec %%PREFIX%%/bin/javavm -classpath "%%PREFIX%%/jdk%%JDK_VERSION%%/lib/classes.zip:%%PREFIX%%/share/java/classes/jfc-%%JFC_VERSION%%/swingall.jar:%%PREFIX%%/share/java/AirportBaseStationConfig.jar" AirportBaseStationConfigurator
 
 exit 1
diff --git a/net-mgmt/airport/pkg-plist b/net-mgmt/airport/pkg-plist
index 68fe8b4f540f..cbfeb33023f9 100644
--- a/net-mgmt/airport/pkg-plist
+++ b/net-mgmt/airport/pkg-plist
@@ -1,9 +1,10 @@
 bin/airport
-share/airport/AUTHORS
-share/airport/COPYING
-share/airport/AirportBaseStationConfig.jar
-share/airport/helpdocs/ReadMe.txt
-share/airport/helpdocs/mainscreen.jpg
-share/airport/helpdocs/manual.html
-@dirrm share/airport/helpdocs
-@dirrm share/airport
+share/java/AirportBaseStationConfig.jar
+share/doc/airport/AUTHORS
+share/doc/airport/COPYING
+share/doc/airport/helpdocs/ReadMe.txt
+share/doc/airport/helpdocs/mainscreen.jpg
+share/doc/airport/helpdocs/manual.html
+@dirrm share/doc/airport/helpdocs
+@dirrm share/doc/airport
+@unexec rmdir %D/share/java || true
diff --git a/net/airport/Makefile b/net/airport/Makefile
index c6f4f0040da1..ffb6585bcfa9 100644
--- a/net/airport/Makefile
+++ b/net/airport/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	airport
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	http://edge.mcs.drexel.edu/GICL/people/sevy/airport/
 DISTFILES=	configurator_${PORTVERSION:S/.//}${EXTRACT_SUFX}
@@ -30,8 +31,12 @@ NO_BUILD=	yes
 
 do-install:
 	@cd ${WRKSRC}; \
-		${MKDIR} ${PREFIX}/share/airport; \
-		${CP} -r ${WRKSRC}/* ${PREFIX}/share/airport; \
+		${MKDIR} ${PREFIX}/share/doc/airport/helpdocs; \
+		${MKDIR} ${PREFIX}/share/java; \
+		${INSTALL_DATA} ${WRKSRC}/*jar ${PREFIX}/share/java; \
+		${CP} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/airport; \
+		${CP} ${WRKSRC}/COPYING ${PREFIX}/share/doc/airport; \
+		${CP} -r ${WRKSRC}/helpdocs/* ${PREFIX}/share/doc/airport/helpdocs; \
 		${SED} \
 			-e s,%%PREFIX%%,${PREFIX},g \
 			-e s/%%JFC_VERSION%%/${JFC_VERSION}/ \
diff --git a/net/airport/files/airport b/net/airport/files/airport
index 5c8303d602b7..2ae406c629cb 100644
--- a/net/airport/files/airport
+++ b/net/airport/files/airport
@@ -1,9 +1,9 @@
 #! /bin/sh
 
 # Use this one for JDK 1.2 and beyond:
-# exec %%PREFIX%%/bin/javavm -jar %%PREFIX%%/share/airport/AirportBaseStationConfig.jar
+# exec %%PREFIX%%/bin/javavm -jar %%PREFIX%%/share/java/AirportBaseStationConfig.jar
 
 # Use this one for the default installation -- JDK 1.1.x + JFC:
-exec %%PREFIX%%/bin/javavm -classpath "%%PREFIX%%/jdk%%JDK_VERSION%%/lib/classes.zip:%%PREFIX%%/share/java/classes/jfc-%%JFC_VERSION%%/swingall.jar:%%PREFIX%%/share/airport/AirportBaseStationConfig.jar" AirportBaseStationConfigurator
+exec %%PREFIX%%/bin/javavm -classpath "%%PREFIX%%/jdk%%JDK_VERSION%%/lib/classes.zip:%%PREFIX%%/share/java/classes/jfc-%%JFC_VERSION%%/swingall.jar:%%PREFIX%%/share/java/AirportBaseStationConfig.jar" AirportBaseStationConfigurator
 
 exit 1
diff --git a/net/airport/pkg-plist b/net/airport/pkg-plist
index 68fe8b4f540f..cbfeb33023f9 100644
--- a/net/airport/pkg-plist
+++ b/net/airport/pkg-plist
@@ -1,9 +1,10 @@
 bin/airport
-share/airport/AUTHORS
-share/airport/COPYING
-share/airport/AirportBaseStationConfig.jar
-share/airport/helpdocs/ReadMe.txt
-share/airport/helpdocs/mainscreen.jpg
-share/airport/helpdocs/manual.html
-@dirrm share/airport/helpdocs
-@dirrm share/airport
+share/java/AirportBaseStationConfig.jar
+share/doc/airport/AUTHORS
+share/doc/airport/COPYING
+share/doc/airport/helpdocs/ReadMe.txt
+share/doc/airport/helpdocs/mainscreen.jpg
+share/doc/airport/helpdocs/manual.html
+@dirrm share/doc/airport/helpdocs
+@dirrm share/doc/airport
+@unexec rmdir %D/share/java || true