diff --git a/sgmllib.py b/Milter/sgmllib.py
similarity index 100%
rename from sgmllib.py
rename to Milter/sgmllib.py
diff --git a/mime.py b/mime.py
index b6a4a7e64e710c41688a0d6324e597170a326b75..76f8a886ec0ced9d0509d8d6024604b2fce3124b 100644
--- a/mime.py
+++ b/mime.py
@@ -401,7 +401,10 @@ class _defang:
 # emulate old defang function
 defang = _defang()
 
-from sgmllib import SGMLParser as HTMLParser
+if sys.version < '3.0.0':
+    from sgmllib import SGMLParser as HTMLParser
+else:
+    from Milter.sgmllib import SGMLParser as HTMLParser
 
 import re
 declname = re.compile(r'[a-zA-Z][-_.a-zA-Z0-9]*\s*')
diff --git a/setup.py b/setup.py
index aa8103f70c7c029c56fbccd8020e713d3ac33f8f..722cb72416f27a9c34a314ce0800365bcbc14316 100644
--- a/setup.py
+++ b/setup.py
@@ -12,9 +12,6 @@ if sys.version < '2.6.5':
 libs = ["milter"]
 libdirs = ["/usr/lib/libmilter"]    # needed for Debian
 modules = ["mime"]
-if sys.version >= '3':
-  modules.append("sgmllib")
-  print("modules=",modules)
 
 # NOTE: importing Milter to obtain version fails when milter.so not built
 setup(name = "pymilter", version = '1.0.2',