diff --git a/generators/app/index.js b/generators/app/index.js
index 938af2e..bb4f2fb 100644
--- a/generators/app/index.js
+++ b/generators/app/index.js
@@ -5,6 +5,7 @@ var chalk = require('chalk');
 var generators = require('yeoman-generator');
 var shelljs = require('shelljs');
 var yosay = require('yosay');
+var pkg = require('../../package.json');
 
 module.exports = generators.Base.extend({
   constructor: function () {
@@ -34,7 +35,6 @@ module.exports = generators.Base.extend({
   },
 
   initializing: function () {
-    this.props = {};
     this.pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
   },
 
@@ -156,8 +156,10 @@ on Github](https://github.com/sondr3/generator-jekyllized).
       local: require.resolve('generator-statisk/generators/readme')
     });
 
-    this.composeWith('jekyllized:gulp', {
+    this.composeWith('statisk:gulp', {
       options: {
+        name: pkg.name,
+        version: pkg.version,
         uploading: this.props.uploading,
         babel: this.props.babel
       }
diff --git a/test/gulp.js b/test/gulp.js
index 308aad3..4d4e16f 100644
--- a/test/gulp.js
+++ b/test/gulp.js
@@ -5,12 +5,18 @@ var assert = require('yeoman-assert');
 var helpers = require('yeoman-test');
 
 test.before(() => {
+  var pkg = require('../package.json');
+
   var deps = [
     [helpers.createDummyGenerator(), 'statisk:gulp']
   ];
 
   return helpers.run(path.join(__dirname, '../generators/app'))
-    .withOptions({uploading: 'None'})
+    .withOptions({
+      name: pkg.name,
+      version: pkg.version,
+      uploading: 'None'
+    })
     .withGenerators(deps)
     .toPromise();
 });
@@ -23,6 +29,12 @@ test('creates package.json', () => {
   assert.file('package.json');
 });
 
+test('creates comment about creation', () => {
+  const pkg = require('../package.json');
+  const date = (new Date).toISOString().split('T')[0]; // eslint-disable-line
+  assert.fileContent('gulpfile.js', '// generated on ' + date + ' using ' + pkg.name + ' ' + pkg.version);
+});
+
 test('creates gulp task files', () => {
   assert.file([
     'gulp/tasks/browsersync.js',
@@ -38,4 +50,3 @@ test('creates gulp task files', () => {
     'gulp/tasks/uploading.js'
   ]);
 });
-