diff --git a/README.md b/README.md
index 8971e8c3c..bbf0ed830 100644
--- a/README.md
+++ b/README.md
@@ -160,6 +160,9 @@ You can generate a changelog for all versions by using `--first`
 $ aegir-relase --first
 ```
 
+You can skip all changelog generation and the github release by passing
+in `--no-changelog`.
+
 ## Other Notes
 
 There is a badge.
diff --git a/tasks/release/changelog.js b/tasks/release/changelog.js
index 5e0ac570e..4a12e4646 100644
--- a/tasks/release/changelog.js
+++ b/tasks/release/changelog.js
@@ -3,6 +3,11 @@
 const $ = require('gulp-load-plugins')()
 
 module.exports = (gulp, done) => {
+  if ($.util.env.changelog === false) {
+    $.util.log('Skipping changelog generation')
+    return done()
+  }
+
   const releaseCount = $.util.env.first ? 0 : 1
 
   return gulp.src('CHANGELOG.md')
diff --git a/tasks/release/github.js b/tasks/release/github.js
index 3b7ca1cde..c555df5e0 100644
--- a/tasks/release/github.js
+++ b/tasks/release/github.js
@@ -4,6 +4,11 @@ const $ = require('gulp-load-plugins')()
 const conventionalGithubReleaser = require('conventional-github-releaser')
 
 module.exports = (gulp, done) => {
+  if ($.util.env.changelog === false) {
+    $.util.log('Skipping github release')
+    return done()
+  }
+
   const token = process.env.GH_TOKEN || $.util.env.token
 
   if (!token) {