diff --git a/Gemfile.lock b/Gemfile.lock
index 7ae761cf3d..e5c82dce25 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,6 +54,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   codeclimate-test-reporter
diff --git a/config/components.yml b/config/components.yml
index a24db3b07f..afd40979c3 100644
--- a/config/components.yml
+++ b/config/components.yml
@@ -42,3 +42,4 @@ frameworks:
   - "JavaBuildpack::Framework::PostgresqlJDBC"
   - "JavaBuildpack::Framework::SpringAutoReconfiguration"
   - "JavaBuildpack::Framework::SpringInsight"
+  - "JavaBuildpack::Framework::StagingTimestamp"
diff --git a/config/open_jdk_jre.yml b/config/open_jdk_jre.yml
index 7358095fac..1c71cf57af 100644
--- a/config/open_jdk_jre.yml
+++ b/config/open_jdk_jre.yml
@@ -17,13 +17,11 @@
 # If Java 7 is required, permgen will be used instead of metaspace. Please see the documentation for more detail.
 ---
 repository_root: "{default.repository.root}/openjdk/{platform}/{architecture}"
-version: 1.8.0_+
+version: 1.8.0_25
 memory_sizes:
   metaspace: 64m..
-  permgen: 64m..
 memory_heuristics:
-  heap: 75
+  heap: 85
   metaspace: 10
-  permgen: 10
   stack: 5
-  native: 10
+  native: 10
\ No newline at end of file
diff --git a/lib/java_buildpack/framework/staging_timestamp.rb b/lib/java_buildpack/framework/staging_timestamp.rb
new file mode 100644
index 0000000000..9d55eda5a1
--- /dev/null
+++ b/lib/java_buildpack/framework/staging_timestamp.rb
@@ -0,0 +1,22 @@
+require 'java_buildpack/framework'
+
+module JavaBuildpack::Framework
+
+  # Adds a system property containing a timestamp of when the application was staged.
+  class StagingTimestamp < JavaBuildpack::Component::BaseComponent
+    def initialize(context)
+      super(context)
+    end
+
+    def detect
+      'staging-timestamp'
+    end
+
+    def compile
+    end
+
+    def release
+      @droplet.java_opts.add_system_property('staging.timestamp', "'#{Time.now}'")
+    end
+  end
+end
\ No newline at end of file