diff --git a/completions/bash/feedgnuplot b/completions/bash/feedgnuplot
new file mode 100644
index 0000000..63b0333
--- /dev/null
+++ b/completions/bash/feedgnuplot
@@ -0,0 +1,39 @@
+complete -W                                     \
+'                                               \
+    --domain                                    \
+    --dataid                                    \
+    --3d                                        \
+    --colormap                                  \
+    --stream                                    \
+    --lines                                     \
+    --points                                    \
+    --circles                                   \
+    --xlabel                                    \
+    --ylabel                                    \
+    --y2label                                   \
+    --zlabel                                    \
+    --zlabel                                    \
+    --title                                     \
+    --autolegend                                \
+    --xlen                                      \
+    --xmin                                      \
+    --xmax                                      \
+    --ymin                                      \
+    --ymax                                      \
+    --y2min                                     \
+    --y2max                                     \
+    --zmin                                      \
+    --zmax                                      \
+    --y2                                        \
+    --curvestyleall                             \
+    --extracmds                                 \
+    --size                                      \
+    --square                                    \
+    --square_xy                                 \
+    --hardcopy                                  \
+    --maxcurves                                 \
+    --monotonic                                 \
+    --extraValuesPerPoint                       \
+    --dump                                      \
+    --curvestyle                                \
+    --legend' feedgnuplot
diff --git a/completions/zsh/_feedgnuplot b/completions/zsh/_feedgnuplot
new file mode 100644
index 0000000..a5733fa
--- /dev/null
+++ b/completions/zsh/_feedgnuplot
@@ -0,0 +1,40 @@
+#compdef feedgnuplot
+
+_arguments -S                                                                           \
+    '()--domain[first element of each line is the domain variable]'                     \
+    '--dataid[each data point is preceded by the corresponding ID]'                     \
+    '(--monotonic --xlen)--3d'                                                          \
+    '--colormap[show a colormapped xy plot]'                                            \
+    '--stream[Plot the data in realtime]::period in s:'                                 \
+    '--lines'                                                                           \
+    '--points'                                                                          \
+    '--circles'                                                                         \
+    '--xlabel:X-axis label:'                                                            \
+    '--ylabel:Y-axis label:'                                                            \
+    '--y2label:Y2-axis label:'                                                          \
+    '--zlabel:Z-axis label:'                                                            \
+    '--zlabel:Z-axis label:'                                                            \
+    '--title:Plot title:'                                                               \
+    '--autolegend[Label each plot with its data ID]'                                    \
+    '(--3d)--xlen[the size of the x-window to plot]::window size:'                      \
+    '--xmin:min X:'                                                                     \
+    '--xmax:max X:'                                                                     \
+    '--ymin:min Y:'                                                                     \
+    '--ymax:max Y:'                                                                     \
+    '--y2min:min Y2:'                                                                   \
+    '--y2max:max Y2:'                                                                   \
+    '--zmin:min Z:'                                                                     \
+    '--zmax:max Z:'                                                                     \
+    '*--y2:plot to place on the Y2 axis:'                                               \
+    '--curvestyleall[Additional styles for ALL curves]:'                                \
+    '*--extracmds[Additional gnuplot commands]:'                                        \
+    '--size[Gnuplot size option]:'                                                      \
+    '--square[Plot data with square aspect ratio]'                                      \
+    '--square_xy[For 3D plots, set square aspect ratio for ONLY the x,y axes]'          \
+    '--hardcopy[Plot to a file]:'                                                       \
+    '--maxcurves[The maximum allowed number of curves]:'                                \
+    '(--3d)--monotonic[Resets plot if an X in the past is seen]'                        \
+    '--extraValuesPerPoint[How many extra values are given for each data point]:'       \
+    '--dump[Instead of printing to gnuplot, print to STDOUT]'                           \
+    '*--curvestyle[Additional styles for a curve]:curve id: :style:'                    \
+    '*--legend[Legend for a curve]:curve id: :legend:'
diff --git a/debian/feedgnuplot.install b/debian/feedgnuplot.install
new file mode 100644
index 0000000..adae1ac
--- /dev/null
+++ b/debian/feedgnuplot.install
@@ -0,0 +1,2 @@
+completions/bash/feedgnuplot /etc/bash_completion.d/
+completions/zsh/_feedgnuplot /usr/share/zsh/vendor-completions