diff --git a/old-configure.in b/old-configure.in
index e8422fd50ee..974796d12bc 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -7589,6 +7589,27 @@ if test -n "$DISABLE_MOZ_RIL_GEOLOC"; then
 fi
 AC_SUBST(DISABLE_MOZ_RIL_GEOLOC)
 
+dnl ========================================================
+dnl = Use the Servo Style System for Gecko.
+dnl =
+dnl = This linkage setup is temporary, and for experimental
+dnl = purposes. We will vendor servo and integrate the build
+dnl = systems before actually shipping anything.
+dnl ========================================================
+MOZ_ARG_WITH_STRING(servo,
+[  --with-servo=SERVO_TARGET_DIR
+                Absolute path of the target directory where libgeckoservo can
+                be found. This is generally servo_src_dir/target/release.
+                Passing this flag enables experimental integration with the
+                servo style system],
+  SERVO_TARGET_DIR=$withval,
+  SERVO_TARGET_DIR=)
+if test -n "$SERVO_TARGET_DIR"; then
+   MOZ_SERVO_LIBS="-L${SERVO_TARGET_DIR} -lgeckoservo"
+   AC_DEFINE(MOZ_STYLO)
+   AC_SUBST_LIST(MOZ_SERVO_LIBS)
+fi
+
 dnl ========================================================
 dnl =
 dnl = Misc. Options
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 1058679373f..a678f59f03d 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -212,6 +212,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android':
 
 OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
+OS_LIBS += CONFIG['MOZ_SERVO_LIBS']
 
 if CONFIG['MOZ_NATIVE_JPEG']:
     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']