diff --git a/www/kojiweb/archiveinfo.chtml b/www/kojiweb/archiveinfo.chtml
index 0f31eaa4..0f443e47 100644
--- a/www/kojiweb/archiveinfo.chtml
+++ b/www/kojiweb/archiveinfo.chtml
@@ -5,17 +5,21 @@
 #attr _PASSTHROUGH = ['archiveID', 'fileOrder', 'fileStart', 'buildrootOrder', 'buildrootStart']
 
 #include "includes/header.chtml"
-  <h4>Information for archive $archive.filename</h4>
+  <h4>Information for archive <a href="archiveinfo?archiveID=$archive.id">$archive.filename</a></h4>
 
   <table>
     <tr>
       <th>ID</th><td>$archive.id</td>
     </tr>
     <tr>
+    #if $wininfo
+      <th>File Name</th><td>$wininfo.relpath/$archive.filename</td>
+    #else
       <th>File Name</th><td>$archive.filename</td>
+    #end if
     </tr>
     <tr>
-      <th>File Type</th><td>$archive_type.name</td>
+      <th>File Type</th><td>$archive_type.description</td>
     </tr>
     <tr>
       <th>Build</th><td><a href="buildinfo?buildID=$build.id">$koji.buildLabel($build)</a></td>
@@ -37,6 +41,14 @@
     <tr>
       <th>MD5 Sum</th><td>$archive.md5sum</td>
     </tr>
+    #if $wininfo
+    <tr>
+      <th>Platforms</th><td>$wininfo.platforms</td>
+    </tr>
+    <tr>
+      <th>Flags</th><td>$wininfo.flags</td>
+    </tr>
+    #end if
     #if $builtInRoot
     <tr>
       <th>Buildroot</th><td><a href="buildrootinfo?buildrootID=$builtInRoot.id">$builtInRoot.tag_name-$builtInRoot.id-$builtInRoot.repo_id</a></td>
diff --git a/www/kojiweb/buildinfo.chtml b/www/kojiweb/buildinfo.chtml
index 1bf436c7..87a379f8 100644
--- a/www/kojiweb/buildinfo.chtml
+++ b/www/kojiweb/buildinfo.chtml
@@ -158,16 +158,24 @@
 	  <tr>
 	    <th>$ext</th>
 	    <td>
-	      #if $mavenbuild and $ext == 'pom'
-	      (<a href="$downloadBase/$nvrpath/data/logs/maven2/">build logs</a>)
-	      #end if
+              #if $ext == $exts[0]
+	        #if $mavenbuild
+                (<a href="$downloadBase/$nvrpath/data/logs/maven2/">build logs</a>)
+                #elif $winbuild
+                (<a href="$downloadBase/$nvrpath/data/logs/win/">build logs</a>)
+	        #end if
+              #end if
 	    </td>
 	  </tr>
 	  #for $archive in $archivesByExt[$ext]
 	  <tr>
 	    <td/>
 	    <td>
-	      $archive.filename (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$archiveurl/$archive.filename">download</a>)
+            #if $mavenbuild
+            $archive.filename (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$archiveurl/$archive.filename">download</a>)
+            #elif $winbuild
+            $archive.relpath/$archive.filename (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$downloadBase/$nvrpath/win/$archive.relpath/$archive.filename">download</a>)
+            #end if
 	    </td>
 	  </tr>
 	  #end for
diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py
index 361498bf..40683e03 100644
--- a/www/kojiweb/index.py
+++ b/www/kojiweb/index.py
@@ -1014,7 +1014,14 @@ def buildinfo(req, buildID):
     rpms = server.listBuildRPMs(build['id'])
     rpms.sort(_sortbyname)
     mavenbuild = server.getMavenBuild(buildID)
-    archives = server.listArchives(build['id'], queryOpts={'order': 'filename'})
+    winbuild = server.getWinBuild(buildID)
+    if mavenbuild:
+        archivetype = 'maven'
+    elif winbuild:
+        archivetype = 'win'
+    else:
+        archivetype = None
+    archives = server.listArchives(build['id'], type=archivetype, queryOpts={'order': 'filename'})
     archivesByExt = {}
     for archive in archives:
         archivesByExt.setdefault(os.path.splitext(archive['filename'])[1][1:], []).append(archive)
@@ -1084,6 +1091,7 @@ def buildinfo(req, buildID):
     values['debuginfoByArch'] = debuginfoByArch
     values['task'] = task
     values['mavenbuild'] = mavenbuild
+    values['winbuild'] = winbuild
     values['archives'] = archives
     values['archivesByExt'] = archivesByExt
     
@@ -1286,6 +1294,7 @@ def archiveinfo(req, archiveID, fileOrder='name', fileStart=None, buildrootOrder
     archive_type = server.getArchiveType(type_id=archive['type_id'])
     build = server.getBuild(archive['build_id'])
     maveninfo = server.getMavenArchive(archive['id'])
+    wininfo = server.getWinArchive(archive['id'])
     builtInRoot = None
     if archive['buildroot_id'] != None:
         builtInRoot = server.getBuildroot(archive['buildroot_id'])
@@ -1302,6 +1311,7 @@ def archiveinfo(req, archiveID, fileOrder='name', fileStart=None, buildrootOrder
     values['archive_type'] = archive_type
     values['build'] = build
     values['maveninfo'] = maveninfo
+    values['wininfo'] = wininfo
     values['builtInRoot'] = builtInRoot
     values['buildroots'] = buildroots