diff --git a/fml/conf/mcp.cfg b/fml/conf/mcp.cfg
index 7b408e5fa..a4beb87f7 100644
--- a/fml/conf/mcp.cfg
+++ b/fml/conf/mcp.cfg
@@ -150,6 +150,6 @@ CmdRGReobf    = %s -cp "{classpath}" RetroGuard -notch {conffile}
 CmdJadretro   = %s -jar %s {targetdir}
 CmdFernflower = %s -jar %s -din=0 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
 CmdExceptor   = %s -jar %s {input} {output} {conf} {log}
-CmdRecomp     = %s -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdRecomp     = %s -encoding UTF-8 -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
 CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
 CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start
diff --git a/fml/install/fml.py b/fml/install/fml.py
index 3cf11f045..1691a7269 100644
--- a/fml/install/fml.py
+++ b/fml/install/fml.py
@@ -31,10 +31,10 @@ def download_deps(mcp_path):
         
         if not os.path.isfile(target):
             try:
-                urllib.urlretrieve('http://cloud.github.com/downloads/cpw/FML/' + lib, target)
+                urllib.urlretrieve('http://files.minecraftforge.net/fmllibs/' + lib, target)
                 print 'Downloaded %s successfully' % lib
             except:
-                print 'Download %s failed, download manually from http://cloud.github.com/downloads/cpw/FML/%s and place in MCP/lib' % (lib, lib)
+                print 'Download %s failed, download manually from http://files.minecraftforge.net/fmllibs/%s or http://files.minecraftforge.net/fmllibs/fml_libs_dev.zip and place in MCP/lib' % (lib, lib)
                 ret = False
     
     return ret