diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile
index 4016e1e4eb38..c3ed0c8d3dc9 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	fsharp
-PORTVERSION=	1.9.6.2
+PORTVERSION=	1.9.6.16
 CATEGORIES=	lang
-MASTER_SITES=	http://download.microsoft.com/download/7/5/c/75c5ac35-9c13-4737-b363-3c930002259a/
+MASTER_SITES=	http://download.microsoft.com/download/F/7/4/F74A3170-261C-4E8F-B1A8-2E352C61A89B/
 DISTNAME=	fsharp
 
 MAINTAINER=	pgj@FreeBSD.org
@@ -34,15 +34,7 @@ WRKSRC=	${WRKDIR}/FSharp-${PORTVERSION}
 USE_ZIP=	yes
 RESTRICTED=	Microsoft Research Shared Source License Agreement
 
-AOT=		Build \
-		Compiler.CodeDom Compiler.Interactive.Settings Compiler.Server.Shared Compiler \
-		Core \
-		LanguageService \
-		PowerPack.Linq PowerPack.Math.Providers PowerPack.Plot.Excel PowerPack.Plot.Neutral \
-		PowerPack.Plot.XCeed PowerPack.Plot PowerPack \
-		ProjectSystem.Base ProjectSystem.FSharp ProjectSystem.PropertyPages \
-		VS.FSI
-
+AOT=		Core Compiler PowerPack
 WRAPPERS=	fsc fsi fslex fsyacc
 
 post-extract:
@@ -57,8 +49,8 @@ do-install:
 .for asm in ${AOT}
 	@ ${GACUTIL_INSTALL} ${WRKSRC}/bin/FSharp.${asm}.dll
 .endfor
-	@ ${MKDIR} ${PREFIX}/${PORTDIR} ${PREFIX}/${PORTDIR}/bin ${PREFIX}/${PORTDIR}/setup ${DOCSDIR}
-	@ (cd ${WRKSRC} && ${COPYTREE_SHARE} "bin setup" ${PREFIX}/${PORTDIR}/)
+	@ ${MKDIR} ${PREFIX}/${PORTDIR} ${PREFIX}/${PORTDIR}/bin ${DOCSDIR}
+	@ (cd ${WRKSRC} && ${COPYTREE_SHARE} "bin" ${PREFIX}/${PORTDIR}/)
 	@ ${INSTALL_DATA} ${WRKSRC}/LICENSE-fsharp.txt ${DOCSDIR}/
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}/doc ${DOCSDIR}/manual
diff --git a/lang/fsharp/distinfo b/lang/fsharp/distinfo
index 050913df9344..e065fc49e186 100644
--- a/lang/fsharp/distinfo
+++ b/lang/fsharp/distinfo
@@ -1,3 +1,3 @@
-MD5 (fsharp.zip) = b0f8f208a967d6f344d568928c270c8a
-SHA256 (fsharp.zip) = c3b1a1a31b484b8758f5ef799acd44613ced3e417334decb45217fb2263021a3
-SIZE (fsharp.zip) = 14056489
+MD5 (fsharp.zip) = 9ba68e9c49e7941cd4801f2a481c90a9
+SHA256 (fsharp.zip) = 29c0691879a79ac84059d8a615508da4c7da27908e6bdbf5e3d85b53635b20a4
+SIZE (fsharp.zip) = 21226155
diff --git a/lang/fsharp/pkg-plist b/lang/fsharp/pkg-plist
index c61eb4a86b2b..7ae6efe9392c 100644
--- a/lang/fsharp/pkg-plist
+++ b/lang/fsharp/pkg-plist
@@ -1,22 +1,7 @@
 @comment $FreeBSD$
-@unexec gacutil -u FSharp.Build
-@unexec gacutil -u FSharp.Compiler.CodeDom
-@unexec gacutil -u FSharp.Compiler.Interactive.Settings
-@unexec gacutil -u FSharp.Compiler.Server.Shared
 @unexec gacutil -u FSharp.Compiler
 @unexec gacutil -u FSharp.Core
-@unexec gacutil -u FSharp.LanguageService
-@unexec gacutil -u FSharp.PowerPack.Linq
-@unexec gacutil -u FSharp.PowerPack.Math.Providers
-@unexec gacutil -u FSharp.PowerPack.Plot.Excel
-@unexec gacutil -u FSharp.PowerPack.Plot.Neutral
-@unexec gacutil -u FSharp.PowerPack.Plot.XCeed
-@unexec gacutil -u FSharp.PowerPack.Plot
 @unexec gacutil -u FSharp.PowerPack
-@unexec gacutil -u FSharp.ProjectSystem.Base
-@unexec gacutil -u FSharp.ProjectSystem.FSharp
-@unexec gacutil -u FSharp.ProjectSystem.PropertyPages
-@unexec gacutil -u FSharp.VS.FSI
 bin/fsi
 bin/fsc
 bin/fslex
@@ -33,10 +18,17 @@ bin/fsyacc
 %%SUBDIR%%/bin/FSharp.Core.pdb
 %%SUBDIR%%/bin/FSharp.Core.xml
 %%SUBDIR%%/bin/FSharp.LanguageService.dll
+%%SUBDIR%%/bin/FSharp.LanguageService.Base.dll
+%%SUBDIR%%/bin/FSharp.PowerPack.Build.Tasks.dll
+%%SUBDIR%%/bin/FSharp.PowerPack.Build.Tasks.pdb
+%%SUBDIR%%/bin/FSharp.PowerPack.Build.Tasks.xml
 %%SUBDIR%%/bin/FSharp.PowerPack.Linq.dll
 %%SUBDIR%%/bin/FSharp.PowerPack.Linq.pdb
 %%SUBDIR%%/bin/FSharp.PowerPack.Linq.xml
 %%SUBDIR%%/bin/FSharp.PowerPack.Math.Providers.dll
+%%SUBDIR%%/bin/FSharp.PowerPack.Metadata.dll
+%%SUBDIR%%/bin/FSharp.PowerPack.Metadata.pdb
+%%SUBDIR%%/bin/FSharp.PowerPack.Metadata.xml
 %%SUBDIR%%/bin/FSharp.PowerPack.Plot.Excel.dll
 %%SUBDIR%%/bin/FSharp.PowerPack.Plot.Neutral.dll
 %%SUBDIR%%/bin/FSharp.PowerPack.Plot.XCeed.dll
@@ -50,8 +42,6 @@ bin/fsyacc
 %%SUBDIR%%/bin/FSharp.ProjectSystem.PropertyPages.dll
 %%SUBDIR%%/bin/FSharp.VS.FSI.dll
 %%SUBDIR%%/bin/Microsoft.FSharp.targets
-%%SUBDIR%%/bin/Microsoft.VC90.CRT.manifest
-%%SUBDIR%%/bin/absilsuppc.dll
 %%SUBDIR%%/bin/fsc.exe
 %%SUBDIR%%/bin/fsi.exe
 %%SUBDIR%%/bin/fslex.exe
@@ -65,9 +55,16 @@ bin/fsyacc
 %%SUBDIR%%/bin/gac/FSharp.Core.pdb
 %%SUBDIR%%/bin/gac/FSharp.Core.xml
 %%SUBDIR%%/bin/gac/FSharp.LanguageService.dll
+%%SUBDIR%%/bin/gac/FSharp.LanguageService.Base.dll
+%%SUBDIR%%/bin/gac/FSharp.PowerPack.Build.Tasks.dll
+%%SUBDIR%%/bin/gac/FSharp.PowerPack.Build.Tasks.pdb
+%%SUBDIR%%/bin/gac/FSharp.PowerPack.Build.Tasks.xml
 %%SUBDIR%%/bin/gac/FSharp.PowerPack.Linq.dll
 %%SUBDIR%%/bin/gac/FSharp.PowerPack.Linq.pdb
 %%SUBDIR%%/bin/gac/FSharp.PowerPack.Linq.xml
+%%SUBDIR%%/bin/gac/FSharp.PowerPack.Metadata.dll
+%%SUBDIR%%/bin/gac/FSharp.PowerPack.Metadata.pdb
+%%SUBDIR%%/bin/gac/FSharp.PowerPack.Metadata.xml
 %%SUBDIR%%/bin/gac/FSharp.PowerPack.dll
 %%SUBDIR%%/bin/gac/FSharp.PowerPack.pdb
 %%SUBDIR%%/bin/gac/FSharp.PowerPack.xml
@@ -79,16 +76,14 @@ bin/fsyacc
 %%SUBDIR%%/bin/gac/policy.1.9.FSharp.Compiler.CodeDom.dll.config
 %%SUBDIR%%/bin/gac/policy.1.9.FSharp.Core.dll
 %%SUBDIR%%/bin/gac/policy.1.9.FSharp.Core.dll.config
+%%SUBDIR%%/bin/gac/policy.1.9.FSharp.PowerPack.Build.Tasks.dll
+%%SUBDIR%%/bin/gac/policy.1.9.FSharp.PowerPack.Build.Tasks.dll.config
 %%SUBDIR%%/bin/gac/policy.1.9.FSharp.PowerPack.Linq.dll
 %%SUBDIR%%/bin/gac/policy.1.9.FSharp.PowerPack.Linq.dll.config
+%%SUBDIR%%/bin/gac/policy.1.9.FSharp.PowerPack.Metadata.dll
+%%SUBDIR%%/bin/gac/policy.1.9.FSharp.PowerPack.Metadata.dll.config
 %%SUBDIR%%/bin/gac/policy.1.9.FSharp.PowerPack.dll
 %%SUBDIR%%/bin/gac/policy.1.9.FSharp.PowerPack.dll.config
-%%SUBDIR%%/bin/msvcm90.dll
-%%SUBDIR%%/bin/msvcp90.dll
-%%SUBDIR%%/bin/msvcr90.dll
 @dirrm %%SUBDIR%%/bin/gac
 @dirrm %%SUBDIR%%/bin
-%%SUBDIR%%/setup/cordir.exe
-%%SUBDIR%%/setup/gac.exe
-@dirrm %%SUBDIR%%/setup
 @dirrm %%SUBDIR%%