diff --git a/com.oracle.truffle.r.native/library/README b/com.oracle.truffle.r.native/library/README
index ff0732e186a54ec948e7fafdb6c3579375b5f2c1..3b933fbd7d144153eaf7144170c4640b2ab9bd43 100644
--- a/com.oracle.truffle.r.native/library/README
+++ b/com.oracle.truffle.r.native/library/README
@@ -8,3 +8,7 @@ referenced in the R package code to become defined.
 
 Note that 'datasets' and 'fastr' don't actually have any native code, but it is convenient to store them here. Note also that
 'fastr', obviously, does not originate from GnuR, so its build process is completely different.
+
+Given that we only support MacOS/Linux, it is expedient to just store the tar'ed content of the GnuR library directories
+for those targets as 'source' files in the distribution. In time, when FastR can create packages directly, the build will
+change to work that way.
diff --git a/com.oracle.truffle.r.native/library/datasets/src/darwin/datasets.tar.gz b/com.oracle.truffle.r.native/library/datasets/src/darwin/datasets.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..3947d5106b7a86b2e8418e4508f685e0d654c181
Binary files /dev/null and b/com.oracle.truffle.r.native/library/datasets/src/darwin/datasets.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/datasets/src/datasets.tar.gz b/com.oracle.truffle.r.native/library/datasets/src/datasets.tar.gz
deleted file mode 100644
index 7cc4c9d24730758ada764ec8192356dfc91a383f..0000000000000000000000000000000000000000
Binary files a/com.oracle.truffle.r.native/library/datasets/src/datasets.tar.gz and /dev/null differ
diff --git a/com.oracle.truffle.r.native/library/datasets/src/linux/datasets.tar.gz b/com.oracle.truffle.r.native/library/datasets/src/linux/datasets.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..1fd422dc67fd7bd436b4d51f6f35aadbcd33b2a1
Binary files /dev/null and b/com.oracle.truffle.r.native/library/datasets/src/linux/datasets.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/grDevices/src/darwin/grDevices.tar.gz b/com.oracle.truffle.r.native/library/grDevices/src/darwin/grDevices.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..6a63f01bb66a888288b2a83efac6005038efbcf8
Binary files /dev/null and b/com.oracle.truffle.r.native/library/grDevices/src/darwin/grDevices.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/grDevices/src/grDevices.tar.gz b/com.oracle.truffle.r.native/library/grDevices/src/grDevices.tar.gz
deleted file mode 100644
index 7ea5af84b33ccda32746eae66f2ce587fb31b64d..0000000000000000000000000000000000000000
Binary files a/com.oracle.truffle.r.native/library/grDevices/src/grDevices.tar.gz and /dev/null differ
diff --git a/com.oracle.truffle.r.native/library/grDevices/src/linux/grDevices.tar.gz b/com.oracle.truffle.r.native/library/grDevices/src/linux/grDevices.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..3d1ac7ac405e5ffc009d9e363324ade9fd04c4d4
Binary files /dev/null and b/com.oracle.truffle.r.native/library/grDevices/src/linux/grDevices.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/graphics/src/darwin/graphics.tar.gz b/com.oracle.truffle.r.native/library/graphics/src/darwin/graphics.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..212c7df7c0dadbc45eaa649de3601c85ea36530f
Binary files /dev/null and b/com.oracle.truffle.r.native/library/graphics/src/darwin/graphics.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/graphics/src/graphics.tar.gz b/com.oracle.truffle.r.native/library/graphics/src/graphics.tar.gz
deleted file mode 100644
index 88a127ddc12af3aaa66ede1c09970b38cac0451c..0000000000000000000000000000000000000000
Binary files a/com.oracle.truffle.r.native/library/graphics/src/graphics.tar.gz and /dev/null differ
diff --git a/com.oracle.truffle.r.native/library/graphics/src/linux/graphics.tar.gz b/com.oracle.truffle.r.native/library/graphics/src/linux/graphics.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..5261179864a058582d2419304b3bbd53be2a19c3
Binary files /dev/null and b/com.oracle.truffle.r.native/library/graphics/src/linux/graphics.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/lib.mk b/com.oracle.truffle.r.native/library/lib.mk
index 64d2c5726715c8103e25f21b77a78fbbf29dda91..a6753c5de16d360faf30d74ce00f63f2c86ceecd 100644
--- a/com.oracle.truffle.r.native/library/lib.mk
+++ b/com.oracle.truffle.r.native/library/lib.mk
@@ -53,7 +53,7 @@ FFI_INCLUDES = -I$(TOPDIR)/include/jni
 INCLUDES := $(JNI_INCLUDES) $(FFI_INCLUDES)
 
 PKGDIR := $(FASTR_LIBDIR)/$(PKG)
-PKGTAR := $(SRC)/$(PKG).tar.gz
+PKGTAR := $(SRC)/$(OS_DIR)/$(PKG).tar.gz
 
 ifneq ($(C_SOURCES),)
 all: libcommon $(LIB_PKG)
@@ -63,13 +63,14 @@ endif
 
 libcommon: $(PKGDIR)
 
-$(PKGDIR):
+$(PKGDIR): $(PKGTAR)
 	tar xf $(PKGTAR) -C $(FASTR_LIBDIR)
 
 $(OBJ):
 	mkdir -p $(OBJ)
 
-$(LIB_PKG): $(OBJ) $(C_OBJECTS)
+$(LIB_PKG): $(OBJ) $(C_OBJECTS) $(PKGTAR)
+
 	mkdir -p $(LIBDIR)
 	$(CC) $(LDFLAGS) -o $(LIB_PKG) $(C_OBJECTS)
 	cp $(LIB_PKG) $(FASTR_LIBDIR)/$(PKG)/libs
diff --git a/com.oracle.truffle.r.native/library/methods/src/darwin/methods.tar.gz b/com.oracle.truffle.r.native/library/methods/src/darwin/methods.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..5a632c966a01c8899d50627777b75284b82acb35
Binary files /dev/null and b/com.oracle.truffle.r.native/library/methods/src/darwin/methods.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/methods/src/linux/methods.tar.gz b/com.oracle.truffle.r.native/library/methods/src/linux/methods.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..b9bad8b220a1cf6bfda08f79be627e1cc0ae0665
Binary files /dev/null and b/com.oracle.truffle.r.native/library/methods/src/linux/methods.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/methods/src/methods.tar.gz b/com.oracle.truffle.r.native/library/methods/src/methods.tar.gz
deleted file mode 100644
index 68de2dde696e0524c8cfbb1ca3a3b4327f9db345..0000000000000000000000000000000000000000
Binary files a/com.oracle.truffle.r.native/library/methods/src/methods.tar.gz and /dev/null differ
diff --git a/com.oracle.truffle.r.native/library/stats/src/darwin/stats.tar.gz b/com.oracle.truffle.r.native/library/stats/src/darwin/stats.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..d6c7b5bc546043ec88cdc5e86d84022a3eb46863
Binary files /dev/null and b/com.oracle.truffle.r.native/library/stats/src/darwin/stats.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/stats/src/linux/stats.tar.gz b/com.oracle.truffle.r.native/library/stats/src/linux/stats.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..cdc47d97e21dc0ad7599796ed42ffdc15047d05a
Binary files /dev/null and b/com.oracle.truffle.r.native/library/stats/src/linux/stats.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/stats/src/stats.tar.gz b/com.oracle.truffle.r.native/library/stats/src/stats.tar.gz
deleted file mode 100644
index 4131a771a602761168981ec26097cb4beccbe092..0000000000000000000000000000000000000000
Binary files a/com.oracle.truffle.r.native/library/stats/src/stats.tar.gz and /dev/null differ
diff --git a/com.oracle.truffle.r.native/library/tools/src/tools.tar.gz b/com.oracle.truffle.r.native/library/tools/src/darwin/tools.tar.gz
similarity index 71%
rename from com.oracle.truffle.r.native/library/tools/src/tools.tar.gz
rename to com.oracle.truffle.r.native/library/tools/src/darwin/tools.tar.gz
index fb2a35239153f2363397d4e8718536ca5f0dc2a4..5206eade92228114372059508a01e61b1d9e2c92 100644
Binary files a/com.oracle.truffle.r.native/library/tools/src/tools.tar.gz and b/com.oracle.truffle.r.native/library/tools/src/darwin/tools.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/tools/src/linux/tools.tar.gz b/com.oracle.truffle.r.native/library/tools/src/linux/tools.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..0df25746913367282906baca8f9977534e149321
Binary files /dev/null and b/com.oracle.truffle.r.native/library/tools/src/linux/tools.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/utils/src/darwin/utils.tar.gz b/com.oracle.truffle.r.native/library/utils/src/darwin/utils.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..a3c9400bfd43b1cc8f9ddbc0d65160392fd6a52a
Binary files /dev/null and b/com.oracle.truffle.r.native/library/utils/src/darwin/utils.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/utils/src/linux/utils.tar.gz b/com.oracle.truffle.r.native/library/utils/src/linux/utils.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..4c32b3e6a215c67a5fdde654d9b563b95c8671c8
Binary files /dev/null and b/com.oracle.truffle.r.native/library/utils/src/linux/utils.tar.gz differ
diff --git a/com.oracle.truffle.r.native/library/utils/src/utils.tar.gz b/com.oracle.truffle.r.native/library/utils/src/utils.tar.gz
deleted file mode 100644
index b6dabc7b316ce42bc68640cd77ef12a70666da9c..0000000000000000000000000000000000000000
Binary files a/com.oracle.truffle.r.native/library/utils/src/utils.tar.gz and /dev/null differ