diff --git a/CHANGES b/CHANGES
index 8f0ec315f6..c8163e0440 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 Next release
 ============
 
+* FIX: Amend create_tbss_non_fa() workflow to match FSL's tbss_non_fa command. (https://github.com/nipy/nipype/pull/1033)
 * FIX: remove unused mandatory flag from spm normalize (https://github.com/nipy/nipype/pull/1048)
 * ENH: Update ANTSCorticalThickness interface (https://github.com/nipy/nipype/pull/1013)
 * FIX: Edge case with sparsemodels and PEP8 cleanup (https://github.com/nipy/nipype/pull/1046)
diff --git a/nipype/workflows/dmri/fsl/tbss.py b/nipype/workflows/dmri/fsl/tbss.py
index 510722646f..10e54161ca 100644
--- a/nipype/workflows/dmri/fsl/tbss.py
+++ b/nipype/workflows/dmri/fsl/tbss.py
@@ -504,6 +504,7 @@ def create_tbss_non_FA(name='tbss_non_FA'):
     >>> tbss_MD.inputs.inputnode.groupmask = './xxx'
     >>> tbss_MD.inputs.inputnode.meanfa_file = './xxx'
     >>> tbss_MD.inputs.inputnode.distance_map = []
+    >>> tbss_MD.inputs.inputnode.all_FA_file = './xxx'
 
     Inputs::
 
@@ -513,6 +514,7 @@ def create_tbss_non_FA(name='tbss_non_FA'):
         inputnode.groupmask
         inputnode.meanfa_file
         inputnode.distance_map
+        inputnode.all_FA_file
 
     Outputs::
 
@@ -526,7 +528,8 @@ def create_tbss_non_FA(name='tbss_non_FA'):
                                                                  'skeleton_thresh',
                                                                  'groupmask',
                                                                  'meanfa_file',
-                                                                 'distance_map']),
+                                                                 'distance_map',
+                                                                 'all_FA_file']),
                         name='inputnode')
 
     # Apply the warpfield to the non FA image
@@ -560,10 +563,11 @@ def create_tbss_non_FA(name='tbss_non_FA'):
 
                     (inputnode, maskgroup, [('groupmask', 'in_file2')]),
 
-                    (maskgroup, projectfa, [('out_file', 'data_file')]),
+                    (maskgroup, projectfa, [('out_file', 'alt_data_file')]),
                     (inputnode, projectfa, [('skeleton_thresh', 'threshold'),
                                             ("meanfa_file", "in_file"),
                                             ("distance_map", "distance_map"),
+                                             ("all_FA_file", 'data_file')
                                             ]),
                 ])