diff --git a/eventlet/green/SimpleHTTPServer.py b/eventlet/green/SimpleHTTPServer.py
new file mode 100644
index 0000000..6581f7d
--- /dev/null
+++ b/eventlet/green/SimpleHTTPServer.py
@@ -0,0 +1,13 @@
+from eventlet import patcher
+from eventlet.green import BaseHTTPServer
+from eventlet.green import urllib
+
+patcher.inject('SimpleHTTPServer',
+    globals(),
+    ('BaseHTTPServer', BaseHTTPServer),
+    ('urllib',  urllib))
+
+del patcher
+
+if __name__ == '__main__':
+    test()
\ No newline at end of file
diff --git a/tests/stdlib/test_SimpleHTTPServer.py b/tests/stdlib/test_SimpleHTTPServer.py
new file mode 100644
index 0000000..889891f
--- /dev/null
+++ b/tests/stdlib/test_SimpleHTTPServer.py
@@ -0,0 +1,9 @@
+from eventlet import patcher
+from eventlet.green import SimpleHTTPServer
+
+patcher.inject('test.test_SimpleHTTPServer',
+    globals(),
+    ('SimpleHTTPServer', SimpleHTTPServer))
+    
+if __name__ == "__main__":
+    test_main()
\ No newline at end of file
diff --git a/tests/stdlib/test_ssl.py b/tests/stdlib/test_ssl.py
index f0fb7a5..faa4f31 100644
--- a/tests/stdlib/test_ssl.py
+++ b/tests/stdlib/test_ssl.py
@@ -4,10 +4,10 @@ from eventlet.green import BaseHTTPServer
 from eventlet.green import select
 from eventlet.green import socket
 from eventlet.green import SocketServer
+from eventlet.green import SimpleHTTPServer
 from eventlet.green import ssl
 from eventlet.green import threading
 from eventlet.green import urllib
-# *TODO: SimpleHTTPServer
 
 # stupid test_support messing with our mojo
 import test.test_support