diff --git a/TennisForTwo.py b/TennisForTwo.py
index ddc1169..4f1b95a 100644
--- a/TennisForTwo.py
+++ b/TennisForTwo.py
@@ -837,6 +837,9 @@ def main():
 
 #    startLogging('tennis.log')
 
+    pygame.display.set_caption('Tennis For Two')
+    pygame.display.set_icon(pygame.image.load('tennis.bmp'))
+    
     Game.screen = pygame.display.set_mode(SCREENRECT.size, DOUBLEBUF, 16)
 
     Game.evMgr = EventManager()    
@@ -853,6 +856,7 @@ def main():
 
 
 
+
 #@-node:jpenner.20050319125841:Setup
 #@-others
 #@nonl
diff --git a/pygame2exe.py b/pygame2exe.py
index c49264f..353e69a 100644
--- a/pygame2exe.py
+++ b/pygame2exe.py
@@ -14,7 +14,7 @@ import py2exe
 
 
 script = "TennisForTwo.py"	#name of starting .PY
-icon_file = ""	    	    	#ICO file for the .EXE (not working well)
+icon_file = "tennis.ico"	    	    	#ICO file for the .EXE (not working well)
 optimize = 2 	    	    	#0, 1, or 2; like -O and -OO
 dos_console = 0     	    	#set to 0 for no dos shell when run
 extra_data = ['data'] #extra files/dirs copied to game
@@ -31,8 +31,8 @@ project_name = os.path.splitext(os.path.split(script)[1])[0]
 
 #this will create the executable and all dependencies
 setup(#name=project_name,
-      windows=[script],
-      data_files=[("data", glob.glob("data\\*.wav")),(".", ["C:\\python24\\lib\\site-packages\\pygame\\freesansbold.ttf"])]
+      windows=[{"script": script, "icon_resources": [(1, icon_file)]}],
+      data_files=[("data", glob.glob("data\\*.wav")),(".", ["C:\\python24\\lib\\site-packages\\pygame\\freesansbold.ttf", "tennis.bmp"])]
      )
 
 
diff --git a/tennis.bmp b/tennis.bmp
new file mode 100644
index 0000000..7112949
Binary files /dev/null and b/tennis.bmp differ
diff --git a/tennis.ico b/tennis.ico
new file mode 100644
index 0000000..f023086
Binary files /dev/null and b/tennis.ico differ