diff --git a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs
index 4dee0b94c6..5afaa53bf6 100644
--- a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs
@@ -361,6 +361,7 @@
 			this.SaveButton = new System.Windows.Forms.Button();
 			this.CancelBT = new System.Windows.Forms.Button();
 			this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+			this.GLideN64_FXAA = new System.Windows.Forms.CheckBox();
 			this.N64plugintabcontrol.SuspendLayout();
 			this.N64vpluginglobaltab.SuspendLayout();
 			this.GLideN64Tab.SuspendLayout();
@@ -518,7 +519,7 @@
 			this.label47.AutoSize = true;
 			this.label47.Location = new System.Drawing.Point(10, 115);
 			this.label47.Name = "label47";
-            this.label47.Size = new System.Drawing.Size(275, 13);
+			this.label47.Size = new System.Drawing.Size(319, 13);
 			this.label47.TabIndex = 14;
 			this.label47.Text = "(GLideN64 is the newest pluging and has the highest compatibility)";
 			// 
@@ -604,6 +605,7 @@
 			// 
 			// tabPage5
 			// 
+			this.tabPage5.Controls.Add(this.GLideN64_FXAA);
 			this.tabPage5.Controls.Add(this.label88);
 			this.tabPage5.Controls.Add(this.GLideN64_GammaCorrectionLevel);
 			this.tabPage5.Controls.Add(this.GLideN64_ForceGammaCorrection);
@@ -4382,6 +4384,16 @@
 			this.toolTip1.ReshowDelay = 100;
 			this.toolTip1.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
 			// 
+			// GLideN64_FXAA
+			// 
+			this.GLideN64_FXAA.AutoSize = true;
+			this.GLideN64_FXAA.Location = new System.Drawing.Point(6, 237);
+			this.GLideN64_FXAA.Name = "GLideN64_FXAA";
+			this.GLideN64_FXAA.Size = new System.Drawing.Size(53, 17);
+			this.GLideN64_FXAA.TabIndex = 79;
+			this.GLideN64_FXAA.Text = "FXAA";
+			this.GLideN64_FXAA.UseVisualStyleBackColor = true;
+			// 
 			// N64VideoPluginconfig
 			// 
 			this.AcceptButton = this.SaveButton;
@@ -4775,5 +4787,6 @@
 		private System.Windows.Forms.TextBox GLideN64_GammaCorrectionLevel;
 		private System.Windows.Forms.Label label89;
 		private System.Windows.Forms.TextBox GLideN64_UseNativeResolutionFactor;
+		private System.Windows.Forms.CheckBox GLideN64_FXAA;
 	}
 }
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs
index 2b0f1b5469..569b2ba45e 100644
--- a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs
+++ b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs
@@ -408,6 +408,7 @@ namespace BizHawk.Client.EmuHawk
 			_ss.GLideN64Plugin.CacheSize = GLideN64_CacheSize.Text.IsSigned()
 				? int.Parse(GLideN64_CacheSize.Text)
 				: 500;
+			_ss.GLideN64Plugin.FXAA = GLideN64_FXAA.Checked;
 			_ss.GLideN64Plugin.EnableNoise = GLideN64_EnableNoise.Checked;
 			_ss.GLideN64Plugin.EnableLOD = GLideN64_EnableLOD.Checked;
 			_ss.GLideN64Plugin.EnableHWLighting = GLideN64_HWLighting.Checked;
@@ -748,6 +749,7 @@ namespace BizHawk.Client.EmuHawk
 				.PopulateFromEnum<N64SyncSettings.N64GLideN64PluginSettings.bilinearFilteringMode>(_ss.GLideN64Plugin.bilinearMode);
 			GLideN64_MaxAnisotropy.Checked = _ss.GLideN64Plugin.MaxAnisotropy;
 			GLideN64_CacheSize.Text = _ss.GLideN64Plugin.CacheSize.ToString();
+			GLideN64_FXAA.Checked = _ss.GLideN64Plugin.FXAA;
 			GLideN64_EnableNoise.Checked = _ss.GLideN64Plugin.EnableNoise;
 			GLideN64_EnableLOD.Checked = _ss.GLideN64Plugin.EnableLOD;
 			GLideN64_HWLighting.Checked = _ss.GLideN64Plugin.EnableHWLighting;
diff --git a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.resx b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.resx
index af1cb484f3..f1e278dae9 100644
--- a/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.resx
+++ b/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.resx
@@ -120,6 +120,9 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <data name="AnisotropicFiltering_LB.ToolTip" xml:space="preserve">
     <value>Enable/Disable Anisotropic Filtering for Mipmapping (0=no filtering, 2-16=quality). 
 This is uneffective if Mipmapping is 0.
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.GLideN64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.GLideN64.cs
index 9a0cd9c61e..d7fb79f012 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.GLideN64.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.GLideN64.cs
@@ -21,6 +21,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
 				bilinearMode = bilinearFilteringMode.Standard;
 				MaxAnisotropy = false;
 				CacheSize = 8000;
+				FXAA = false;
 				EnableNoise = true;
 				EnableLOD = true;
 				EnableHWLighting = false;
@@ -133,6 +134,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
 			[Description("Size of texture cache in megabytes. Good value is VRAM*3/4")]
 			public int CacheSize { get; set; }
 
+			[DefaultValue(false)]
+			[DisplayName("FXAA")]
+			[Description("Enable Fast Approximate Anti-Aliasing.")]
+			public bool FXAA { get; set; }
+
 			[DefaultValue(true)]
 			[DisplayName("Color noise emulation")]
 			[Description("Enable color noise emulation.")]
diff --git a/libmupen64plus/GLideN64 b/libmupen64plus/GLideN64
index fec7309dc9..e222e0cb22 160000
--- a/libmupen64plus/GLideN64
+++ b/libmupen64plus/GLideN64
@@ -1 +1 @@
-Subproject commit fec7309dc945e7c37f707a1f8e96d6e4bff9c63d
+Subproject commit e222e0cb22b4bc9844d76f82de0af279dd812829
diff --git a/output/dll/mupen64plus-video-GLideN64.dll b/output/dll/mupen64plus-video-GLideN64.dll
index 2d4981fdc4..a2cb0a6269 100644
Binary files a/output/dll/mupen64plus-video-GLideN64.dll and b/output/dll/mupen64plus-video-GLideN64.dll differ