diff --git a/trunk/locale/en-US.xml b/trunk/locale/en-US.xml
index 99babfe..5adf40f 100755
--- a/trunk/locale/en-US.xml
+++ b/trunk/locale/en-US.xml
@@ -44,8 +44,13 @@
 	<str id="button_register">register</str>
 	<str id="button_login">login</str>
 
+	<!-- upload page -->
+	<str id="file">file</str>
+	<str id="button_upload">upload</str>
+
 	<!-- dublin core entities -->
 	<str id="DC.title">title</str>
+	<str id="DC.description">description</str>
 	<str id="DC.creator">author</str>
 	<str id="DC.publisher">uploader</str>
 
diff --git a/trunk/site/gnutube.xml b/trunk/site/gnutube.xml
index bf1e4b6..57b7506 100755
--- a/trunk/site/gnutube.xml
+++ b/trunk/site/gnutube.xml
@@ -22,6 +22,7 @@
 	<str id="page_register">register.pl</str>
 	<str id="page_results">search.pl?query=</str>
 	<str id="page_upload">upload.pl</str>
+	<str id="page_uploader">uploader.pl</str>
 
 </strings>
 
diff --git a/trunk/style/gnutube.css b/trunk/style/gnutube.css
index a480316..935464f 100755
--- a/trunk/style/gnutube.css
+++ b/trunk/style/gnutube.css
@@ -61,13 +61,13 @@ div
 			vertical-align:		text-top;
 		}
 
-	div.loginform, div.registerform
+	div.loginform, div.registerform, div.uploadform
 	{
 		padding:		1.5em;
 		text-align:		center;
 	}
 	
-	div.loginform form, div.registerform form
+	div.loginform form, div.registerform form, div.uploadform form
 	{
 		margin:			1.5em;
 	}
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index bd63295..70dd939 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -290,7 +290,7 @@
 		</xsl:for-each>
 	</table>
 
-</xsl:template>v
+</xsl:template>
 
 <xsl:template match="registerform">
 
@@ -351,4 +351,37 @@
 
 </xsl:template>
 
+<xsl:template match="uploadform">
+
+	<div class="uploadform">
+
+		<form method="post" enctype="multipart/from-data">
+			<xsl:attribute name="action">
+				<xsl:value-of select="$site_strings/str[@id='page_uploader']" />
+			</xsl:attribute>
+			<fieldset>
+				<xsl:value-of select="$locale_strings/str[@id='file']" />:
+				<br />				
+				<input name="file" type="file" size="15" />
+				<br />
+				<xsl:value-of select="$locale_strings/str[@id='DC.title']" />:
+				<br />
+				<input name="title" type="text" size="30" />
+				<br />
+				<xsl:value-of select="$locale_strings/str[@id='DC.description']" />:
+				<br />
+				<input name="caption" type="text" size="30" />
+				<br />
+				<input type="submit" name="submit" >
+					<xsl:attribute name="value">
+						<xsl:value-of select="$locale_strings/str[@id='button_upload']" />
+					</xsl:attribute>
+				</input>
+			</fieldset>
+		</form>
+
+	</div>
+
+</xsl:template>
+
 </xsl:stylesheet>