diff --git a/website/index.html b/website/index.html
index 404735fc..b07d677d 100644
--- a/website/index.html
+++ b/website/index.html
@@ -43,25 +43,20 @@
 			</a>
 		</div>
 		<div class="video">
-			<video width="800" height="480" controls="controls">
+			<video width="800" height="480" poster="videos/poster.png" controls="controls">
 				<source src="videos/lombok.ogv" type="video/ogg" />
 				<source src="videos/lombok.mp4" type="video/mp4" />
-				<source src="videos/iPhone.m4v" type="video/mp4" />
-				<object width="800" height="480" type="application/x-shockwave-flash" data="videos/player.swf" flashvars="file=videos/flash.mp4" allowfullscreen="true"
-				>
-					<param name="movie" value="videos/player.swf" />
-					<param name="flashvars" value="file=videos/flash.mp4" />
-					<param name="allowfullscreen" value="true" />
-					<!--[if gt IE 6]>
-					<object width="800" height="480" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B">
-						<param name="src" value="videos/flash.mp4" />
-						<param name="allowfullscreen" value="true" /><!
-						[endif]-->
-						<!--[if gt IE 6]><!-->
-							<object width="480" height="375" type="video/quicktime" data="videos/iPhone.m4v"
- 							>
-								<param name="src" value="videos/iPhone.m4v" />         
-						<!--<![endif]-->
+				<source src="videos/lombok-iPhone.m4v" type="video/mp4" /><!--[if gt IE 6]>
+				<object width="800" height="500" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"><!
+				[endif]--><!--[if !IE]><!-->
+				<object width="800" height="480" type="video/quicktime" data="videos/lombok.mp4"><!--<![endif]-->
+					<param name="src" value="videos/lombok.mp4" />
+					<param name="autoplay" value="false" />
+					<param name="showlogo" value="false" />
+					<object width="800" height="480" type="application/x-shockwave-flash"
+						data="videos/player.swf?image=poster.png&amp;file=lombok.mp4" allowfullscreen="true">
+						<param name="movie" value="videos/player.swf?image=poster.png&amp;file=lombok.mp4" />
+						<param name="allowfullscreen" value="true" />
 						<h3>Video: Lombok Demo</h3>
 						<p>
 							<strong>No video playback capabilities detected.</strong>
@@ -75,9 +70,8 @@
 								or <a href="http://apple.com/safari">Safari v4</a></li>
 								<li>Install <a href="http://get.adobe.com/flashplayer/">Adobe Flash</a></li>
 								<li>Install <a href="http://apple.com/quicktime/download/">QuickTime</a></li>
-							</ul>
-						<!--[if gt IE 6]><!--></object><!--<![endif]-->
-					<!--[if gt IE 6]></object><![endif]-->
+						</ul>
+					</object><!--[if gt IE 6]><!-->
 				</object>
 			</video>
 		</div>
diff --git a/website/poster.png b/website/poster.png
new file mode 100644
index 00000000..4911408f
Binary files /dev/null and b/website/poster.png differ
diff --git a/website/videos/flash.mp4 b/website/videos/flash.mp4
deleted file mode 100644
index 1422f5f9..00000000
Binary files a/website/videos/flash.mp4 and /dev/null differ
diff --git a/website/videos/iPhone.m4v b/website/videos/iPhone.m4v
deleted file mode 100644
index 16f13f86..00000000
Binary files a/website/videos/iPhone.m4v and /dev/null differ
diff --git a/website/videos/lombok-iPhone.m4v b/website/videos/lombok-iPhone.m4v
new file mode 100644
index 00000000..19487ebd
Binary files /dev/null and b/website/videos/lombok-iPhone.m4v differ
diff --git a/website/videos/lombok.mp4 b/website/videos/lombok.mp4
index 1461bf90..b6f2107b 100644
Binary files a/website/videos/lombok.mp4 and b/website/videos/lombok.mp4 differ
diff --git a/website/videos/lombok.ogv b/website/videos/lombok.ogv
index f0d523d9..70e20225 100644
Binary files a/website/videos/lombok.ogv and b/website/videos/lombok.ogv differ
diff --git a/website/videos/poster.png b/website/videos/poster.png
new file mode 100644
index 00000000..4911408f
Binary files /dev/null and b/website/videos/poster.png differ