diff --git a/tools/ffmpeg/.shed.yml b/tools/ffmpeg/.shed.yml
new file mode 100644
index 0000000000..3d893d6fa7
--- /dev/null
+++ b/tools/ffmpeg/.shed.yml
@@ -0,0 +1,17 @@
+name: ffmpeg
+owner: bgruening
+description: A complete, cross-platform solution to record, convert and stream audio and video.
+long_description: |
+    A complete, cross-platform solution to record, convert and stream audio and video.
+type: unrestricted
+categories:
+  - Convert Formats
+remote_repository_url: https://github.com/bgruening/galaxytools/tree/master/tools/ffmpeg
+homepage_url: https://ffmpeg.org
+auto_tool_repositories:
+  name_template: "{{ tool_id }}"
+  description_template: "Wrapper for the ffmpeg suite tool: {{ tool_name }}"
+suite:
+  name: "suite_ffmpeg"
+  description: A complete, cross-platform solution to record, convert and stream audio and video.
+  long_description: A complete, cross-platform solution to record, convert and stream audio and video.
diff --git a/tools/ffmpeg/ffmpeg_converter.xml b/tools/ffmpeg/ffmpeg_converter.xml
new file mode 100644
index 0000000000..fb1086b645
--- /dev/null
+++ b/tools/ffmpeg/ffmpeg_converter.xml
@@ -0,0 +1,88 @@
+<tool id="ffmpeg_converter" name="FFmpeg Format Converter" version="0.1.0" profile="24.2">
+    <description>Convert between video and audio formats</description>
+    <requirements>
+        <requirement type="package" version="7.1.1">ffmpeg</requirement>
+    </requirements>
+    <command detect_errors="exit_code">
+        <![CDATA[
+        ffmpeg -i '$input_file' output.${output_format} &&
+        mv output.${output_format} '$output_file'
+        ]]>
+    </command>
+    <inputs>
+        <param name="input_file" type="data" format="mp4,mov,avi,mkv,mp3,wav,flac,ogg" label="Input media file"/>
+        <param name="output_format" type="select" label="Output format">
+            <option value="mp4">MP4 (video)</option>
+            <option value="mkv">MKV (video)</option>
+            <option value="avi">AVI (video)</option>
+            <option value="mov">MOV (video)</option>
+            <option value="mp3">MP3 (audio)</option>
+            <option value="wav">WAV (audio)</option>
+            <option value="flac">FLAC (audio)</option>
+            <option value="ogg">OGG (audio)</option>
+        </param>
+    </inputs>
+    <outputs>
+        <data name="output_file" format="ogg" from_work_dir="output.@output_format@" label="Converted file (${output_format})">
+            <change_format>
+                <when input="output_format" value="mp4" format="mp4"/>
+                <when input="output_format" value="mkv" format="mkv"/>
+                <when input="output_format" value="avi" format="avi"/>
+                <when input="output_format" value="mov" format="mov"/>
+                <when input="output_format" value="mp3" format="mp3"/>
+                <when input="output_format" value="wav" format="wav"/>
+                <when input="output_format" value="flac" format="flac"/>
+            </change_format>
+        </data>
+    </outputs>
+    <tests>
+        <test expect_num_outputs="1">
+            <param name="input_file" value="SampleVideo_360x240_cut.mp4" ftype="mp4"/>
+            <param name="output_format" value="webm"/>
+            <output name="output_file" file="SampleVideo_360x240_cut.webm" ftype="webm"/>
+        </test>
+        <test expect_num_outputs="1">
+            <param name="input_file" value="SampleVideo_360x240_cut.mp4" ftype="mp4"/>
+            <param name="output_format" value="flac"/>
+            <output name="output_file" file="SampleVideo_360x240_cut.flac" ftype="flac"/>
+        </test>
+        <test expect_num_outputs="1">
+            <param name="input_file" value="SampleVideo_360x240_cut.mp4" ftype="mp4"/>
+            <param name="output_format" value="mp3"/>
+            <output name="output_file" file="SampleVideo_360x240_cut.mp3" ftype="mp3"/>
+        </test>
+        <test expect_num_outputs="1">
+            <param name="input_file" value="SampleVideo_360x240_cut.flac" ftype="flac"/>
+            <param name="output_format" value="ogg"/>
+            <output name="output_file" file="flac_to_ogg.ogg" ftype="ogg"/>
+        </test>
+        <test expect_num_outputs="1">
+            <param name="input_file" value="SampleVideo_360x240_cut.mp4" ftype="mp4"/>
+            <param name="output_format" value="mkv"/>
+            <output name="output_file" file="SampleVideo_360x240_cut.webm" ftype="mkv"/>
+        </test>
+    </tests>
+    <help>
+        This tool uses FFmpeg to convert between common video and audio file formats.
+
+        Input formats:
+        - Video: MP4, MOV, AVI, MKV
+        - Audio: MP3, WAV, FLAC, AAC, OGG
+
+        Select the output format you want, and FFmpeg will handle the conversion.
+    </help>
+    <citations>
+        <citation type="bibtex">
+            @article{tomar2006converting,
+                title={Converting video formats with FFmpeg},
+                author={Tomar, Suramya},
+                journal={Linux Journal},
+                volume={2006},
+                number={146},
+                pages={10},
+                year={2006},
+                publisher={Belltown Media}
+              } 
+        </citation>
+    </citations>
+</tool>
diff --git a/tools/ffmpeg/test-data/.gitignore b/tools/ffmpeg/test-data/.gitignore
new file mode 100644
index 0000000000..14d3304e47
--- /dev/null
+++ b/tools/ffmpeg/test-data/.gitignore
@@ -0,0 +1 @@
+SampleVideo_360x240_1mb.mp4
diff --git a/tools/ffmpeg/test-data/SampleVideo_360x240_cut.flac b/tools/ffmpeg/test-data/SampleVideo_360x240_cut.flac
new file mode 100644
index 0000000000..8b324378f3
Binary files /dev/null and b/tools/ffmpeg/test-data/SampleVideo_360x240_cut.flac differ
diff --git a/tools/ffmpeg/test-data/SampleVideo_360x240_cut.mkv b/tools/ffmpeg/test-data/SampleVideo_360x240_cut.mkv
new file mode 100644
index 0000000000..75b4c4b1dc
Binary files /dev/null and b/tools/ffmpeg/test-data/SampleVideo_360x240_cut.mkv differ
diff --git a/tools/ffmpeg/test-data/SampleVideo_360x240_cut.mp3 b/tools/ffmpeg/test-data/SampleVideo_360x240_cut.mp3
new file mode 100644
index 0000000000..9e0f7ea094
Binary files /dev/null and b/tools/ffmpeg/test-data/SampleVideo_360x240_cut.mp3 differ
diff --git a/tools/ffmpeg/test-data/SampleVideo_360x240_cut.mp4 b/tools/ffmpeg/test-data/SampleVideo_360x240_cut.mp4
new file mode 100644
index 0000000000..bb7b90015f
Binary files /dev/null and b/tools/ffmpeg/test-data/SampleVideo_360x240_cut.mp4 differ
diff --git a/tools/ffmpeg/test-data/SampleVideo_360x240_cut.webm b/tools/ffmpeg/test-data/SampleVideo_360x240_cut.webm
new file mode 100644
index 0000000000..c4b2f5b826
Binary files /dev/null and b/tools/ffmpeg/test-data/SampleVideo_360x240_cut.webm differ
diff --git a/tools/ffmpeg/test-data/converted.mp3 b/tools/ffmpeg/test-data/converted.mp3
new file mode 100644
index 0000000000..f12a0f46b9
Binary files /dev/null and b/tools/ffmpeg/test-data/converted.mp3 differ
diff --git a/tools/ffmpeg/test-data/flac_to_ogg.ogg b/tools/ffmpeg/test-data/flac_to_ogg.ogg
new file mode 100644
index 0000000000..4054fedf60
Binary files /dev/null and b/tools/ffmpeg/test-data/flac_to_ogg.ogg differ
diff --git a/tools/ffmpeg/test-data/readme.txt b/tools/ffmpeg/test-data/readme.txt
new file mode 100644
index 0000000000..3125d2c2c6
--- /dev/null
+++ b/tools/ffmpeg/test-data/readme.txt
@@ -0,0 +1,7 @@
+ffmpeg -ss 00:00:02 -to 00:00:04 -i SampleVideo_360x240_1mb.mp4 -c copy SampleVideo_360x240_cut.mp4
+
+ffmpeg -i SampleVideo_360x240_cut.mp4 SampleVideo_360x240_cut.webm
+ffmpeg -i SampleVideo_360x240_cut.mp4 SampleVideo_360x240_cut.flac
+ffmpeg -i SampleVideo_360x240_cut.mp4 SampleVideo_360x240_cut.mp3
+ffmpeg -i SampleVideo_360x240_cut.flac flac_to_ogg.ogg
+ffmpeg -i SampleVideo_360x240_cut.mp4 SampleVideo_360x240_cut.mkv