diff --git a/src/main/resources/bitrock/alfresco-build-settings.xml b/src/main/resources/bitrock/alfresco-build-settings.xml
index d14425d266..b4ddb3e75b 100644
--- a/src/main/resources/bitrock/alfresco-build-settings.xml
+++ b/src/main/resources/bitrock/alfresco-build-settings.xml
@@ -57,6 +57,7 @@
         <setInstallerVariable name="postgres_distribution_folder" value="${binaries_folder}/postgresql" />
         <setInstallerVariable name="imagemagick_distribution_folder_windows" value="${binaries_folder}/imagemagick" />
         <setInstallerVariable name="imagemagick_distribution_folder_unix" value="${binaries_folder}/ImageMagick" />
+        <setInstallerVariable name="pdfium_distribution_folder" value="${binaries_folder}/alfresco-pdf-renderer"/>
         <setInstallerVariable name="java_distribution_folder" value="${binaries_folder}/java" />
         <setInstallerVariable name="xvfb_distribution_folder" value="${binaries_folder}/Xvfb" />
         <setInstallerVariable name="libreoffice_distribution_folder" value="${binaries_folder}/libreoffice" />
diff --git a/src/main/resources/bitrock/alfresco-customstack-build-settings.xml b/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
index 21bb5acb46..d1d1dc5ffe 100644
--- a/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
+++ b/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
@@ -37,6 +37,7 @@
                 <setInstallerVariable name="java_distribution_folder" value="${local_binaries_folder}/java"/>
                 <setInstallerVariable name="libreoffice_distribution_folder" value="${local_binaries_folder}/libreoffice"/>
                 <setInstallerVariable name="tomcat_distribution_folder" value="${local_binaries_folder}/apache-tomcat"/>
+                <setInstallerVariable name="pdfium_distribution_folder" value="${local_binaries_folder}/alfresco-pdf-renderer"/>
                 <!-- END ALFRESCO BUILD SYSTEM-->
             </actionList>
             <ruleList>
diff --git a/src/main/resources/bitrock/pdfium.xml b/src/main/resources/bitrock/pdfium.xml
new file mode 100644
index 0000000000..e5ca97a0c6
--- /dev/null
+++ b/src/main/resources/bitrock/pdfium.xml
@@ -0,0 +1,82 @@
+<component>
+    <name>pdfium</name>
+    <description>Pdfium</description>
+    <canBeEdited>0</canBeEdited>
+    <show>0</show>
+    <selected>1</selected>
+
+    <parameterList>
+        <directoryParameter>
+            <ask>0</ask>
+            <name>pdfium_root_directory</name>
+            <cliOptionName>pdfiumt_root_directory</cliOptionName>
+        </directoryParameter>
+    </parameterList>
+    <readyToInstallActionList>   
+    
+        <setInstallerVariable name="pdfium_root_directory" value="${installdir}/common">
+            <ruleList>
+                <platformTest type="unix"/>
+            </ruleList>
+        </setInstallerVariable>
+        <setInstallerVariable name="pdfium_root_directory" value="${installdir}">
+            <ruleList>
+                <platformTest type="windows"/>
+            </ruleList>
+        </setInstallerVariable>
+
+        <setInstallerVariable name="PDFIUM_PATH" value="${pdfium_root_directory}">
+            <ruleList>
+                <platformTest type="unix"/>
+            </ruleList>
+        </setInstallerVariable>
+
+        <setInstallerVariable name="PDFIUM_PATH_WIN" value="${pdfium_root_directory}"/>
+
+        <setInstallerVariable name="PATH" value="${PDFIUM_PATH}:${PATH}">
+            <ruleList>
+                <compareText text="${PATH}" value="${PDFIUM_PATH}" nocase="1" logic="does_not_contain"/>
+            </ruleList>
+        </setInstallerVariable>
+        <setInstallerVariable name="PATH_WIN" value="${PDFIUM_PATH_WIN};${PATH_WIN}">
+            <ruleList>
+                <compareText text="${PATH_WIN}" value="${PDFIUM_PATH_WIN}" nocase="1" logic="does_not_contain"/>
+            </ruleList>
+        </setInstallerVariable>
+        
+         <setInstallerVariable name="PDFIUM_ENV_VAR">
+            <value>##### PDFIUM ENV #####
+PDFIUM_ENV_VAR="${pdfium_root_directory}"
+export PDFIUM_ENV_VAR
+
+</value>
+            <ruleList>
+                <platformTest type="unix"/>
+            </ruleList>
+        </setInstallerVariable>
+        <setInstallerVariable name="PDFIUM_ENV_VAR">
+            <value>rem ##### PDFIUM ENV #####
+set PDFIUM_ENV_VAR=${pdfium_root_directory}
+</value>
+            <ruleList>
+                <platformTest type="windows"/>
+            </ruleList>
+        </setInstallerVariable>
+        <setInstallerVariable name="ENV_VAR">
+            <value>${PDFIUM_ENV_VAR}${ENV_VAR}</value>
+        </setInstallerVariable>
+    </readyToInstallActionList>
+    
+    <folderList>
+        <folder>
+            <name>alfresco-pdf-renderer</name>
+            <destination>${pdfium_root_directory}</destination>
+            <distributionFileList>
+                <distributionDirectory allowWildcards="1" origin="${pdfium_distribution_folder}/*"/>
+            </distributionFileList>
+        </folder>
+    </folderList>
+    
+    <postInstallationActionList/>
+</component>
+
diff --git a/src/main/resources/bitrock/project.xml b/src/main/resources/bitrock/project.xml
index d10d682c38..9199403698 100644
--- a/src/main/resources/bitrock/project.xml
+++ b/src/main/resources/bitrock/project.xml
@@ -191,6 +191,7 @@
         <include file="base-unix-service.xml" />
 
         <include file="imagemagick.xml"/>
+        <include file="pdfium.xml"/>
         <include file="alfresco-customstack-postgres-settings.xml" />
         <include file="alfresco-customstack-shortcuts.xml" />
         <include file="alfresco-customstack-validations.xml"/>
diff --git a/src/main/resources/extract-binaries.xml b/src/main/resources/extract-binaries.xml
index b12748ea72..44cce608f9 100644
--- a/src/main/resources/extract-binaries.xml
+++ b/src/main/resources/extract-binaries.xml
@@ -111,6 +111,11 @@
             <condition property="libreoffice.platform" value="windows" else="@{targetPlatform}">
                 <isset property="isPlatformWindows"/>
             </condition>
+        	
+        	 <local name="alfrescoPdfRenderer.platform"/>
+        	 <condition property="alfrescoPdfRenderer.platform" value="win64" else="@{targetPlatform}">
+        	                <isset property="isPlatformWindows"/>
+        	  </condition>
 
             <!-- Accommodate poor Cygwin users -->
             <pathconvert property="maven.localrepo" targetos="unix">
@@ -139,6 +144,14 @@
                 <arg value="xf" />
                 <arg value="${maven.localrepo}/org/imagemagick/imagemagick-distribution/${installer.imagemagick.version}/imagemagick-distribution-${installer.imagemagick.version}-@{targetPlatform}.tgz" />
             </exec>
+
+        	<mkdir dir="${bin.folder}/alfresco-pdf-renderer"/>
+        	<echo> Extracting Alfresco Pdf Renderer...</echo>
+        	<exec failonerror="true" executable="tar" dir="${bin.folder}/alfresco-pdf-renderer">
+        	    <arg value="xf" />
+        	    <arg value="${maven.localrepo}/org/alfresco/alfresco-pdf-renderer/${installer.pdfium.version}/alfresco-pdf-renderer-${installer.pdfium.version}-${alfrescoPdfRenderer.platform}.tgz" />
+        	</exec>
+
         </sequential>
     </macrodef>