diff --git a/src/etc/get-snapshot.py b/src/etc/get-snapshot.py
index 8c85e5b8e39..44a54f90a89 100755
--- a/src/etc/get-snapshot.py
+++ b/src/etc/get-snapshot.py
@@ -64,6 +64,9 @@ triple = sys.argv[1]
 snap = determine_curr_snapshot(triple)
 dl = os.path.join(download_dir_base, snap)
 url = download_url_base + "/" + snap
+# FIXME: Temporary until we have FreeBSD snapshots on the official server
+if "freebsd" in triple:
+  url = "http://plaslab.cs.nctu.edu.tw/~jyyou/rust" + "/" + snap
 print("determined most recent snapshot: " + snap)
 
 if (not os.path.exists(dl)):
diff --git a/src/snapshots.txt b/src/snapshots.txt
index d1c5e52e755..9af8987142a 100644
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -4,6 +4,7 @@ S 2012-02-07 6cf40bd
   macos-i386 0ccb20d7f0039146bcb1771b4a47b40e23793241
   linux-x86_64 00c5f6205cd411e7565b8c0e0f2f38cfcd9af500
   macos-x86_64 8ee4ada52c64925471c20e787abc7fbb49ba7b80
+  freebsd-x86_64 df619d2733da790b7b675993b1b532425211eb7c
 
 S 2012-02-01 196d69b
   winnt-i386 25f5906994ea01dc322a4b52b2b9a4b1264a6c2d