diff --git a/README.md b/README.md
index 5d4a1a2b6..d63e35754 100644
--- a/README.md
+++ b/README.md
@@ -345,6 +345,62 @@ wp scaffold taxonomy <slug> [--post_types=<post-types>] [--label=<label>] [--tex
 
 
 
+### wp scaffold block
+
+Generate PHP, JS and CSS code for registering a custom block.
+
+
+~~~
+wp scaffold taxonomy <slug> [--title=<title>] [--dashicon=<dashicon>] [--category=<category>] [--textdomain=<textdomain>] [--theme] [--plugin=<plugin>] [--force]
+~~~
+
+Blocks are the fundamental element of the Gutenberg editor. They are the primary way in which plugins and themes can register their own functionality and extend the capabilities of the editor.
+
+Learn more from the [Block API documentation](https://wordpress.org/gutenberg/handbook/block-api/).
+
+**OPTIONS**
+
+	<slug>
+		The internal name of the block.
+
+	[--title=<title>]
+		The display title for your block.
+
+	[--dashicon=<dashicon>]
+		The dashicon to make it easier to identify your block.
+
+	[--category=<category>]
+		The category name to help users browse and discover your block.
+		---
+		default: widgets
+		options:
+			- common
+			- embed
+			- formatting
+			- layout
+			- reusable-blocks
+			- widgets
+
+	[--textdomain=<textdomain>]
+		The textdomain to use for the labels.
+
+	[--theme]
+		Create files in the active theme directory. Specify a theme with `--theme=<theme>` to have the file placed in that theme.
+
+	[--plugin=<plugin>]
+		Create files in the given plugin's directory.
+
+	[--force]
+		Overwrite files that already exist.
+
+**EXAMPLES**
+
+	# Generate a 'movie' block for the 'simple-life' theme
+	$ wp scaffold block movie --title="Movie block" --theme=simple-life
+	Success: Created block 'Movie block'.
+
+	Generate PHP code for registering a custom taxonomy.
+
 ### wp scaffold theme-tests
 
 Generate files needed for running PHPUnit tests in a theme.
diff --git a/composer.json b/composer.json
index 02a5a80a1..1ed53acb4 100644
--- a/composer.json
+++ b/composer.json
@@ -36,6 +36,7 @@
         "commands": [
             "scaffold",
             "scaffold _s",
+            "scaffold block",
             "scaffold child-theme",
             "scaffold plugin",
             "scaffold plugin-tests",
diff --git a/features/scaffold-block.feature b/features/scaffold-block.feature
new file mode 100644
index 000000000..a8d35c631
--- /dev/null
+++ b/features/scaffold-block.feature
@@ -0,0 +1,149 @@
+Feature: WordPress block code scaffolding
+
+  Background:
+    Given a WP install
+    Given I run `wp scaffold plugin movies`
+    And I run `wp plugin path movies --dir`
+    And save STDOUT as {PLUGIN_DIR}
+    Given I run `wp theme install p2 --activate`
+    And I run `wp theme path p2 --dir`
+    And save STDOUT as {THEME_DIR}
+
+
+  Scenario: Scaffold a block with an invalid slug
+    When I try `wp scaffold block The_Godfather`
+    Then STDERR should be:
+      """
+      Error: Invalid block slug specified. Block slugs can contain only lowercase alphanumeric characters or dashes, and start with a letter.
+      """
+
+  Scenario: Scaffold a block with a missing plugin and theme
+    When I try `wp scaffold block the-godfather`
+    Then STDERR should be:
+      """
+      Error: No plugin or theme selected.
+      """
+
+  Scenario: Scaffold a block for an invalid plugin
+    When I try `wp scaffold block the-godfather --plugin=unknown`
+    Then STDERR should be:
+      """
+      Error: Can't find 'unknown' plugin.
+      """
+
+  Scenario: Scaffold a block for a specific plugin
+    When I run `wp scaffold block the-green-mile --plugin=movies`
+    Then the {PLUGIN_DIR}/blocks/the-green-mile.php file should exist
+    And the {PLUGIN_DIR}/blocks/the-green-mile.php file should contain:
+      """
+      function the_green_mile_enqueue_block_editor_assets() {
+      """
+    And the {PLUGIN_DIR}/blocks/the-green-mile.php file should contain:
+      """
+      $block_js = 'the-green-mile/block.js';
+      """
+    And the {PLUGIN_DIR}/blocks/the-green-mile.php file should contain:
+      """
+	    $editor_css = 'the-green-mile/editor.css';
+      """
+    And the {PLUGIN_DIR}/blocks/the-green-mile.php file should contain:
+      """
+	    add_action( 'enqueue_block_editor_assets', 'the_green_mile_enqueue_block_editor_assets' );
+      """
+    And the {PLUGIN_DIR}/blocks/the-green-mile/block.js file should exist
+    And the {PLUGIN_DIR}/blocks/the-green-mile/block.js file should contain:
+      """
+      wp.blocks.registerBlockType( 'movies/the-green-mile', {
+      """
+    And the {PLUGIN_DIR}/blocks/the-green-mile/block.js file should contain:
+      """
+      title: __( 'The green mile', 'movies' ),
+      """
+    And the {PLUGIN_DIR}/blocks/the-green-mile/block.js file should contain:
+      """
+      category: 'widgets',
+      """
+    And the {PLUGIN_DIR}/blocks/the-green-mile/block.js file should contain:
+      """
+      __( 'Replace with your content!', 'movies' )
+      """
+    And the {PLUGIN_DIR}/blocks/the-green-mile/editor.css file should exist
+    And the {PLUGIN_DIR}/blocks/the-green-mile/editor.css file should contain:
+      """
+      .wp-block-movies-the-green-mile {
+      """
+    And STDOUT should be:
+      """
+      Success: Created block 'The green mile'.
+      """
+
+  Scenario: Scaffold a block with a specific title provided
+    When I run `wp scaffold block shawshank-redemption --plugin=movies --title="The Shawshank Redemption"`
+    Then the {PLUGIN_DIR}/blocks/shawshank-redemption/block.js file should contain:
+      """
+      title: __( 'The Shawshank Redemption', 'movies' ),
+      """
+    And STDOUT should be:
+      """
+      Success: Created block 'The Shawshank Redemption'.
+      """
+
+  Scenario: Scaffold a block with a specific dashicon provided
+    When I run `wp scaffold block forrest-gump --plugin=movies --dashicon=movie`
+    Then the {PLUGIN_DIR}/blocks/forrest-gump/block.js file should contain:
+      """
+      icon: 'movie',
+      """
+    And STDOUT should be:
+      """
+      Success: Created block 'Forrest gump'.
+      """
+
+  Scenario: Scaffold a block with a specific category provided
+    When I run `wp scaffold block pulp-fiction --plugin=movies --category=embed`
+    Then the {PLUGIN_DIR}/blocks/pulp-fiction/block.js file should contain:
+      """
+      category: 'embed',
+      """
+    And STDOUT should be:
+      """
+      Success: Created block 'Pulp fiction'.
+      """
+
+  Scenario: Scaffold a block with a specific textdomain provided
+    When I run `wp scaffold block inception --plugin=movies --textdomain=MY-MOVIES`
+    Then the {PLUGIN_DIR}/blocks/inception/block.js file should contain:
+      """
+      __( 'Replace with your content!', 'MY-MOVIES' )
+      """
+    And STDOUT should be:
+      """
+      Success: Created block 'Inception'.
+      """
+
+  Scenario: Scaffold a block for an active theme
+    When I run `wp scaffold block fight-club --theme`
+    Then the {THEME_DIR}/blocks/fight-club.php file should exist
+    And the {THEME_DIR}/blocks/fight-club/block.js file should exist
+    And the {THEME_DIR}/blocks/fight-club/editor.css file should exist
+    And STDOUT should be:
+      """
+      Success: Created block 'Fight club'.
+      """
+
+  Scenario: Scaffold a block for an invalid theme
+    When I try `wp scaffold block intouchables --theme=unknown`
+    Then STDERR should be:
+      """
+      Error: Can't find 'unknown' theme.
+      """
+
+  Scenario: Scaffold a block for a specific theme
+    When I run `wp scaffold block intouchables --theme=p2`
+    Then the {THEME_DIR}/blocks/intouchables.php file should exist
+    And the {THEME_DIR}/blocks/intouchables/block.js file should exist
+    And the {THEME_DIR}/blocks/intouchables/editor.css file should exist
+    And STDOUT should be:
+      """
+      Success: Created block 'Intouchables'.
+      """
diff --git a/src/Scaffold_Command.php b/src/Scaffold_Command.php
index a85f2455c..031e9d1b5 100644
--- a/src/Scaffold_Command.php
+++ b/src/Scaffold_Command.php
@@ -150,9 +150,9 @@ private function _scaffold( $slug, $assoc_args, $defaults, $subdir, $templates )
 
 		$vars = $this->extract_args( $assoc_args, $defaults );
 
-		$dashicon = \WP_CLI\Utils\get_flag_value( $assoc_args, 'dashicon' );
+		$dashicon = $this->extract_dashicon( $assoc_args );
 		if ( $dashicon ) {
-			$vars['dashicon'] = preg_replace( '/dashicon(-|s-)/', '', $dashicon );
+			$vars['dashicon'] = $dashicon;
 		}
 
 		$vars['slug'] = $slug;
@@ -165,8 +165,7 @@ private function _scaffold( $slug, $assoc_args, $defaults, $subdir, $templates )
 		$vars['label_plural']         = $this->pluralize( $vars['label'] );
 		$vars['label_plural_ucfirst'] = ucfirst( $vars['label_plural'] );
 
-		// We use the machine name for function declarations
-		$machine_name        = preg_replace( '/-/', '_', $slug );
+		$machine_name        = $this->generate_machine_name( $slug );
 		$machine_name_plural = $this->pluralize( $slug );
 
 		list( $raw_template, $extended_template ) = $templates;
@@ -201,6 +200,104 @@ private function _scaffold( $slug, $assoc_args, $defaults, $subdir, $templates )
 		}
 	}
 
+	/**
+	 * Generate PHP, JS and CSS code for registering a custom block.
+	 *
+	 * Blocks are the fundamental element of the Gutenberg editor. They are the primary way in which plugins and themes can register their own functionality and extend the capabilities of the editor.
+	 * Visit https://wordpress.org/gutenberg/handbook/block-api/ to learn more about Block API.
+	 *
+	 * ## OPTIONS
+	 *
+	 * <slug>
+	 * : The internal name of the block.
+	 *
+	 * [--title=<title>]
+	 * : The display title for your block.
+	 *
+	 * [--dashicon=<dashicon>]
+	 * : The dashicon to make it easier to identify your block.
+	 *
+	 * [--category=<category>]
+	 * : The category name to help users browse and discover your block.
+	 * ---
+	 * default: widgets
+	 * options:
+	 *   - common
+	 *   - embed
+	 *   - formatting
+	 *   - layout
+	 *   - reusable-blocks
+	 *   - widgets
+	 *
+	 * [--textdomain=<textdomain>]
+	 * : The textdomain to use for the labels.
+	 *
+	 * [--theme]
+	 * : Create files in the active theme directory. Specify a theme with `--theme=<theme>` to have the file placed in that theme.
+	 *
+	 * [--plugin=<plugin>]
+	 * : Create files in the given plugin's directory.
+	 *
+	 * [--force]
+	 * : Overwrite files that already exist.
+	 *
+	 * ## EXAMPLES
+	 *
+	 *     # Generate a 'movie' block for the 'simple-life' theme
+	 *     $ wp scaffold block movie --title="Movie block" --theme=simple-life
+	 *      Success: Created block 'Movie block'.
+	 *
+	 * @subcommand block
+	 */
+	public function block( $args, $assoc_args ) {
+
+		$slug = $args[0];
+		if ( ! preg_match( '/^[a-z][a-z0-9\-]*$/', $slug ) ) {
+			WP_CLI::error( "Invalid block slug specified. Block slugs can contain only lowercase alphanumeric characters or dashes, and start with a letter." );
+		}
+
+		$defaults = array(
+			'title'      => str_replace( '-', ' ', $slug ),
+			'category'   => 'widgets',
+			'textdomain' => '',
+		);
+		$data     = $this->extract_args( $assoc_args, $defaults );
+
+		$data['slug']          = $slug;
+		$data['title_ucfirst'] = ucfirst( $data['title'] );
+
+		$dashicon = $this->extract_dashicon( $assoc_args );
+		if ( $dashicon ) {
+			$data['dashicon'] = $dashicon;
+		}
+
+		$control_args = $this->extract_args( $assoc_args, array(
+			'force'  => false,
+			'plugin' => false,
+			'theme'  => false,
+		) );
+
+		$data['namespace'] = $control_args['plugin'] ? $control_args['plugin'] : $this->get_theme_name( $control_args['theme'] );
+		$data['textdomain'] = $this->get_textdomain( $data['textdomain'], $control_args );
+		$data['machine_name'] = $this->generate_machine_name( $slug );
+
+		$block_dir = $this->get_output_path( $control_args, "/blocks" );
+		if ( ! $block_dir ) {
+			WP_CLI::error( "No plugin or theme selected." );
+		}
+
+		$files_written = $this->create_files( array(
+			"$block_dir/$slug.php" => self::mustache_render( 'block-php.mustache', $data ),
+			"$block_dir/$slug/block.js" => self::mustache_render( 'block-block-js.mustache', $data ),
+			"$block_dir/$slug/editor.css" => self::mustache_render( 'block-editor-css.mustache', $data ),
+		), $control_args['force'] );
+		$this->log_whether_files_written(
+			$files_written,
+			$skip_message = 'All block files were skipped.',
+			$success_message = "Created block '{$data['title_ucfirst']}'."
+		);
+	}
+
 	/**
 	 * Generate starter code for a theme based on _s.
 	 *
@@ -419,6 +516,9 @@ private function get_output_path( $assoc_args, $subdir ) {
 			} else {
 				$path = get_stylesheet_directory();
 			}
+			if ( ! is_dir( $path ) ) {
+				WP_CLI::error( "Can't find '$theme' theme." );
+			}
 		} elseif ( $assoc_args['plugin'] ) {
 			$plugin = $assoc_args['plugin'];
 			$path   = WP_PLUGIN_DIR . '/' . $plugin;
@@ -866,6 +966,20 @@ protected function log_whether_files_written( $files_written, $skip_message, $su
 		}
 	}
 
+	/**
+	 * Extract dashicon name when provided or return null otherwise.
+	 *
+	 * @param array $assoc_args
+	 * @return string|null
+	 */
+	private function extract_dashicon( $assoc_args ) {
+		$dashicon = \WP_CLI\Utils\get_flag_value( $assoc_args, 'dashicon' );
+		if ( ! $dashicon ) {
+			return null;
+		}
+		return preg_replace( '/dashicon(-|s-)/', '', $dashicon );
+	}
+
 	/**
 	 * If you're writing your files to your theme directory your textdomain also needs to be the same as your theme.
 	 * Same goes for when plugin is being used.
@@ -876,7 +990,7 @@ private function get_textdomain( $textdomain, $args ) {
 		}
 
 		if ( $args['theme'] ) {
-			return strtolower( wp_get_theme()->template );
+			return $this->get_theme_name( $args['theme'] );
 		}
 
 		if ( $args['plugin'] && true !== $args['plugin'] ) {
@@ -886,6 +1000,16 @@ private function get_textdomain( $textdomain, $args ) {
 		return 'YOUR-TEXTDOMAIN';
 	}
 
+	/**
+	 * Generate the machine name for function declarations.
+	 *
+	 * @param string $slug Slug name to convert.
+	 * @return string
+	 */
+	private function generate_machine_name( $slug ) {
+		return str_replace( '-', '_', $slug );
+	}
+
 	/**
 	 * Pluralize noun
 	 *
@@ -996,4 +1120,18 @@ private static function canonicalize_path( $path ) {
 
 		return implode( '/', $output );
 	}
+
+	/**
+	 * Get an active theme's name when true provided
+	 * or the same name otherwise.
+	 *
+	 * @param string|bool $theme Theme name or true.
+	 * @return string
+	 */
+	private function get_theme_name( $theme ) {
+		if ( true === $theme ) {
+			$theme = wp_get_theme()->template;
+		}
+		return strtolower( $theme );
+	}
 }
diff --git a/templates/block-block-js.mustache b/templates/block-block-js.mustache
new file mode 100644
index 000000000..dcab04b1d
--- /dev/null
+++ b/templates/block-block-js.mustache
@@ -0,0 +1,36 @@
+( function( wp ) {
+	var el = wp.element.createElement;
+	var __ = wp.i18n.__;
+
+	// Visit https://wordpress.org/gutenberg/handbook/block-api/ to learn about Block API
+	wp.blocks.registerBlockType( '{{namespace}}/{{slug}}', {
+		title: __( '{{title_ucfirst}}', '{{textdomain}}' ),
+
+		{{#dashicon}}
+		icon: '{{dashicon}}',
+
+		{{/dashicon}}
+		category: '{{category}}',
+
+		// Remove to make block editable in HTML mode.
+		supportHTML: false,
+
+		edit: function( props ) {
+			return el(
+				'p',
+				{ className: props.className },
+				__( 'Replace with your content!', '{{textdomain}}' )
+			);
+		},
+
+		save: function() {
+			return el(
+				'p',
+				{},
+				__( 'Replace with your content!', '{{textdomain}}' )
+			);
+		}
+	} );
+} )(
+	window.wp
+);
diff --git a/templates/block-editor-css.mustache b/templates/block-editor-css.mustache
new file mode 100644
index 000000000..4df4f151b
--- /dev/null
+++ b/templates/block-editor-css.mustache
@@ -0,0 +1,5 @@
+.wp-block-{{namespace}}-{{slug}} {
+	/* Replace with your styles. */
+	background-color: #000;
+	color: #fff;
+}
diff --git a/templates/block-php.mustache b/templates/block-php.mustache
new file mode 100644
index 000000000..b25e10fde
--- /dev/null
+++ b/templates/block-php.mustache
@@ -0,0 +1,16 @@
+<?php
+
+function {{machine_name}}_enqueue_block_editor_assets() {
+	$dir = dirname( __FILE__ );
+	$block_js = '{{slug}}/block.js';
+	$editor_css = '{{slug}}/editor.css';
+	wp_enqueue_script( '{{slug}}-block', plugins_url( $block_js, __FILE__ ), array(
+		'wp-blocks',
+		'wp-i18n',
+		'wp-element',
+	), filemtime( "$dir/$block_js" ) );
+	wp_enqueue_style( '{{slug}}-block', plugins_url( $editor_css, __FILE__ ), array(
+		'wp-blocks',
+	), filemtime( "$dir/$editor_css" ) );
+}
+add_action( 'enqueue_block_editor_assets', '{{machine_name}}_enqueue_block_editor_assets' );