diff --git a/build/NuGet/FSharp.Sample/MathNet.Numerics.FSharp.Sample.nuspec b/build/NuGet/FSharp.Sample/MathNet.Numerics.FSharp.Sample.nuspec
new file mode 100644
index 00000000..9cddfac2
--- /dev/null
+++ b/build/NuGet/FSharp.Sample/MathNet.Numerics.FSharp.Sample.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>MathNet.Numerics.FSharp.Sample</id>
+    <version>1.0</version>
+    <title>Math.NET Numerics F# Module Code Samples</title>
+    <summary>F# Modules for Math.NET Numerics, providing methods and algorithms for numerical computations in science, engineering and every day use.</summary>
+    <description>F# Modules for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Numerics is the result of merging dnAnalytics with Math.NET Iridium and is intended to replace both.</description>
+    <authors>Marcus Cuda, Christoph Ruegg, Jurgen Van Gael</authors>
+    <owners>Christoph Ruegg</owners>
+    <projectUrl>http://numerics.mathdotnet.com/</projectUrl>
+    <iconUrl>http://www.mathdotnet.com/images/MathNet128.png</iconUrl>
+    <licenseUrl>http://mathnetnumerics.codeplex.com/license</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <tags>math numeric statistics probability integration interpolation linear algebra matrix fft</tags>
+    <dependencies>
+      <dependency id="MathNet.Numerics.FSharp" version="1.0" />
+    </dependencies>
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.Numerics" />
+    </frameworkAssemblies>
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/build/NuGet/nuget.proj b/build/NuGet/nuget.proj
index 45c82c21..e9ec4ecc 100644
--- a/build/NuGet/nuget.proj
+++ b/build/NuGet/nuget.proj
@@ -5,11 +5,13 @@
 	<PropertyGroup>
 		<Root>$(MSBuildProjectDirectory)/../..</Root>
 		<Examples>$(MSBuildProjectDirectory)/../../src/Examples</Examples>
+		<FSharpExamples>$(MSBuildProjectDirectory)/../../src/FSharpExamples</FSharpExamples>
 		<OutLib>$(MSBuildProjectDirectory)/../../out/lib</OutLib>
 		<OutNuGetPackages>$(MSBuildProjectDirectory)/../../out/packages/NuGet</OutNuGetPackages>
 		<NumericsPack>$(MSBuildProjectDirectory)/Numerics</NumericsPack>
 		<FSharpPack>$(MSBuildProjectDirectory)/FSharp</FSharpPack>
 		<NumericsSamplePack>$(MSBuildProjectDirectory)/Numerics.Sample</NumericsSamplePack>
+		<FSharpSamplePack>$(MSBuildProjectDirectory)/FSharp.Sample</FSharpSamplePack>
 		<NuGetExe>$(MSBuildProjectDirectory)/../../tools/NuGet-1.3/nuget.exe</NuGetExe>
 	</PropertyGroup>
 	
@@ -18,6 +20,7 @@
 		<NumericsSL4 Include="$(OutLib)/SL4/MathNet.Numerics.dll;$(OutLib)/SL4/MathNet.Numerics.pdb;$(OutLib)/SL4/MathNet.Numerics.xml;" />
 		<FSharpNet40 Include="$(OutLib)/Net40/MathNet.Numerics.FSharp.dll;$(OutLib)/Net40/MathNet.Numerics.FSharp.pdb;$(OutLib)/Net40/MathNet.Numerics.FSharp.xml" />
 		<NumericsSample Include="$(Examples)/**/*.cs" Exclude="$(Examples)/**/bin/**;$(Examples)/**/obj/**" />
+		<FSharpSample Include="$(FSharpExamples)/**/*.fs" Exclude="$(FSharpExamples)/**/bin/**;$(FSharpExamples)/**/obj/**" />
 	</ItemGroup>
 	
 	<Target Name="CopyContentFiles">
@@ -33,8 +36,11 @@
 		<RemoveDir Directories="$(FSharpPack)/lib" />
 		<Copy SourceFiles="@(FSharpNet40)" DestinationFolder="$(FSharpPack)/lib/Net40" />
 		
-		<RemoveDir Directories="$(NumericsSamplePack)/samples" />
-		<Copy SourceFiles="@(NumericsSample)" DestinationFiles="$(NumericsSamplePack)/samples/MathNet.Numerics/%(RecursiveDir)%(Filename).cs.pp" />
+		<RemoveDir Directories="$(NumericsSamplePack)/Samples" />
+		<Copy SourceFiles="@(NumericsSample)" DestinationFiles="$(NumericsSamplePack)/Samples/MathNet.Numerics/%(RecursiveDir)%(Filename).cs.pp" />
+		
+		<RemoveDir Directories="$(FSharpSamplePack)/Samples" />
+		<Copy SourceFiles="@(FSharpSample)" DestinationFiles="$(FSharpSamplePack)/Samples/MathNet.Numerics.FSharp/%(RecursiveDir)%(Filename).fs.pp" />
 	</Target>
 
 	<Target Name="UpdateNuspec" DependsOnTargets="CopyContentFiles">
@@ -72,12 +78,30 @@
 			XPath="//package/n:metadata/n:dependencies/n:dependency[@id='MathNet.Numerics']/@version"
 			Value="%(NumericsAssemblyInfo.Version)"/>
 		<ItemGroup>
-			<NumericsSamplePreprocessingFiles Include="$(NumericsSamplePack)/samples/MathNet.Numerics/**/*.pp" />
+			<NumericsSamplePreprocessingFiles Include="$(NumericsSamplePack)/Samples/MathNet.Numerics/**/*.pp" />
 		</ItemGroup>
 		<FileUpdate
 			Files="@(NumericsSamplePreprocessingFiles)"
 			Regex="(namespace Examples)"
-			ReplacementText="namespace %24rootnamespace%24.Samples"/>
+			ReplacementText="namespace %24rootnamespace%24.Samples.MathNet.Numerics"/>
+
+		<XmlUpdate
+			Prefix="n" Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"
+			XmlFileName="$(FSharpSamplePack)/MathNet.Numerics.FSharp.Sample.nuspec"
+			XPath="//package/n:metadata/n:version"
+			Value="%(FSharpAssemblyInfo.Version)"/>
+		<XmlUpdate
+			Prefix="n" Namespace="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"
+			XmlFileName="$(FSharpSamplePack)/MathNet.Numerics.FSharp.Sample.nuspec"
+			XPath="//package/n:metadata/n:dependencies/n:dependency[@id='MathNet.Numerics.FSharp']/@version"
+			Value="%(FSharpAssemblyInfo.Version)"/>
+		<ItemGroup>
+			<FSharpSamplePreprocessingFiles Include="$(FSharpSamplePack)/Samples/MathNet.Numerics.FSharp/**/*.pp" />
+		</ItemGroup>
+		<FileUpdate
+			Files="@(FSharpSamplePreprocessingFiles)"
+			Regex="(module MathNet.Numerics.FSharp.Examples)"
+			ReplacementText="module %24rootnamespace%24.Samples.MathNet.Numerics.FSharp"/>
 	</Target>
 
 	<Target Name="BuildPackages" DependsOnTargets="UpdateNuspec">
@@ -85,6 +109,7 @@
 		<Exec Command="$(NuGetExe) pack $(NumericsPack)/MathNet.Numerics.nuspec /Verbose /OutputDirectory $(OutNuGetPackages)" />
 		<Exec Command="$(NuGetExe) pack $(FSharpPack)/MathNet.Numerics.FSharp.nuspec /Verbose /OutputDirectory $(OutNuGetPackages)" />
 		<Exec Command="$(NuGetExe) pack $(NumericsSamplePack)/MathNet.Numerics.Sample.nuspec /Verbose /OutputDirectory $(OutNuGetPackages)" />
+		<Exec Command="$(NuGetExe) pack $(FSharpSamplePack)/MathNet.Numerics.FSharp.Sample.nuspec /Verbose /OutputDirectory $(OutNuGetPackages)" />
 	</Target>
 
 </Project>
\ No newline at end of file