diff --git a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py
index 5c97ba39306..fdcafeba802 100755
--- a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py
+++ b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py
@@ -486,6 +486,14 @@ def install_and_build_package( app, tool_dependency, actions_dict ):
                                     return_code = handle_command( app, tool_dependency, install_dir, cmd )
                                     if return_code:
                                         return
+                        elif action_type == 'make_install':
+                            # make; make install; allow providing make options
+                            with settings( warn_only=True ):
+                                make_opts = action_dict.get( 'make_opts', '' )
+                                cmd = install_environment.build_command( 'make %s && make install' % make_opts )
+                                return_code = handle_command( app, tool_dependency, install_dir, cmd )
+                                if return_code:
+                                    return
                         elif action_type == 'download_file':
                             # Download a single file to the current working directory.
                             url = action_dict[ 'url' ]
diff --git a/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py b/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py
index 7d108846325..dd2eec9949c 100755
--- a/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py
+++ b/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py
@@ -626,6 +626,11 @@ def install_via_fabric( app, tool_dependency, install_dir, package_name=None, pr
                 action_dict[ 'r_packages' ] = r_packages
             else:
                 continue
+        elif action_type == 'make_install':
+            # make; make install; allow providing make options
+            if action_elem.text:
+                make_opts = td_common_util.evaluate_template( action_elem.text, install_dir )
+                action_dict[ 'make_opts' ] = make_opts
         elif action_type == 'chmod':
             # Change the read, write, and execute bits on a file.
             # <action type="chmod">