diff --git a/core/java/src/org/minidns/Dummy.java b/core/java/src/org/minidns/Dummy.java
deleted file mode 100644
index 6dc2189ff759838fd37d719a08170bb3bd6a475d..0000000000000000000000000000000000000000
--- a/core/java/src/org/minidns/Dummy.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.minidns;
-
-/**  
- * Exists only to enable package.html to be included in javadoc.
- * http://java.sun.com/j2se/javadoc/faq/index.html#packagewithoutjavafiles
- */
-abstract class Dummy {}
diff --git a/core/java/src/org/minidns/package-info.java b/core/java/src/org/minidns/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..2bcf84bae96bf95b6212c79a530ba8dcb1f8217a
--- /dev/null
+++ b/core/java/src/org/minidns/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * This is a portion of release 1.0.0 of MiniDNS from https://github.com/MiniDNS/minidns/ 2020-07-18
+ * Only contains the minidns-core portion of the library.
+ * Removed tests, most util classes, and DnsRootServer class.
+ * 
+ * This software may be used under the terms of (at your choice)
+ * - LGPL version 2 (or later) (see LICENSE-LGPLv2.1 for details)
+ * - Apache Software licence (see LICENSE-APACHE2.0 for details)
+ * - WTFPL (see LICENSE-WTFPL for details)
+ */
+package org.minidns;
diff --git a/core/java/src/org/minidns/package.html b/core/java/src/org/minidns/package.html
deleted file mode 100644
index fa2aa829a052c3da0961855e512814a0c8538e29..0000000000000000000000000000000000000000
--- a/core/java/src/org/minidns/package.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html><body>
-<p>
-This is a portion of release 1.0.0 of MiniDNS from https://github.com/MiniDNS/minidns/ 2020-07-18
-Only contains the minidns-core portion of the library.
-Removed tests, most util classes, and DnsRootServer class.
-
-</p><pre>
-
-This software may be used under the terms of (at your choice)
-- LGPL version 2 (or later) (see LICENCE_LGPL2.1 for details)
-- Apache Software licence (see LICENCE_APACHE for details)
-- WTFPL (see LICENCE_WTFPL for details)
-
-
-</pre>
-</body></html>
diff --git a/router/java/src/org/cybergarage/Dummy.java b/router/java/src/org/cybergarage/Dummy.java
deleted file mode 100644
index a7d71c9ad210fba67dce1b88ad1538cf7a52aadb..0000000000000000000000000000000000000000
--- a/router/java/src/org/cybergarage/Dummy.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.cybergarage;
-
-/**  
- * Exists only to enable package.html to be included in javadoc.
- * http://java.sun.com/j2se/javadoc/faq/index.html#packagewithoutjavafiles
- */
-abstract class Dummy {}
diff --git a/router/java/src/org/cybergarage/package-info.java b/router/java/src/org/cybergarage/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..83752897443c2ae8062dcf53c3b21398d2c43c9a
--- /dev/null
+++ b/router/java/src/org/cybergarage/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * The cybergarage cyberlink UPnP library version 3.0, with minor mods for I2P.
+ */
+package org.cybergarage;
diff --git a/router/java/src/org/cybergarage/package.html b/router/java/src/org/cybergarage/package.html
deleted file mode 100644
index 379ce53a040f12009fee34598871295f3cc69b79..0000000000000000000000000000000000000000
--- a/router/java/src/org/cybergarage/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-The cybergarage cyberlink UPnP library version 3.0, with minor mods for I2P.
-</p>
-</body>
-</html>