diff --git a/playbooks/test.yml b/playbooks/test.yml
index 9cd0141..e827a56 100644
--- a/playbooks/test.yml
+++ b/playbooks/test.yml
@@ -6,3 +6,4 @@
     - csc-auth
     - csc-packages
     - csc-filesystems
+    - general-use
diff --git a/roles/core/tasks/packages.yml b/roles/core/tasks/packages.yml
index 5c9b9c5..f0f9d03 100644
--- a/roles/core/tasks/packages.yml
+++ b/roles/core/tasks/packages.yml
@@ -65,6 +65,7 @@
     - tree
     - parted
     - rsync
+    - ncdu
 
 - name: Install network tools
   apt:
@@ -90,6 +91,12 @@
     - tshark
     - ftp
     - tftp
+    - iptables
+    - ebtables
+    - arptables
+    - nmap
+    - socat
+    - ipmitool
 
 - name: Install physical tools
   when: not(ansible_virtualization_role == 'guest')
diff --git a/roles/general-use/tasks/main.yml b/roles/general-use/tasks/main.yml
new file mode 100644
index 0000000..e5a38b3
--- /dev/null
+++ b/roles/general-use/tasks/main.yml
@@ -0,0 +1,260 @@
+---
+
+- name: Install crypto tools
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - gnupg2
+    - gnupg-agent
+    - openssl
+    - pcscd
+    - opensc
+    - gpgsm
+    - keychain
+
+- name: Install network tools
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - ipset
+    - ipcalc
+    - openipmi
+    - cdpr
+    - lksctp-tools
+    - freeipmi-tools
+    - lftp
+    - ncftp
+    - axel
+    - tsocks
+    - snmp
+    - snmp-mibs-downloader
+    - finger
+
+- name: Install filesystem tools
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - fuse
+    - sshfs
+    - dosfstools
+    - davfs2
+    - cloop-utils
+    - ecryptfs-utils
+    - smbclient
+
+- name: Install database tools
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - sqlite
+    - sqlite3
+    - sqlite3-doc
+    - postgresql-client
+    - mysql-client
+    - db-util
+
+- name: Install xml tools
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - xsltproc
+    - libxml2-utils
+    - docbook-xsl
+    - docbook-utils
+    - docbook-dsssl
+    - docbook-to-man
+    - xmlto
+    - fop
+    - opensp
+    - sgml2x
+    - sgmltools-lite
+    - sp
+    - tidy
+    - xalan
+
+- name: Install http tools
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - w3m
+    - links
+    - elinks
+    - lynx
+
+- name: Install typesetting tools (TeX)
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - groff
+    - texlive-full
+    - dvi2ps
+    - dvipng
+    - dvidvi
+    - djvulibre-bin
+    - ghostscript
+    - psutils
+    - pandoc
+
+- name: Install math tools
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - graphviz
+    - r-recommended
+    - euler
+    - euler-doc
+    - gnuplot-doc
+    - gap
+    - lp-solve
+    - mathomatic
+    - maxima
+    - maxima-doc
+    - fplll-tools
+    - gnuplot-nox
+    - coq
+
+- name: Install multimedia tools
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - festival
+    - dvgrab
+    - cdparanoia
+    - genisoimage
+    - sox
+    - mp3blaster
+    - x264
+    - mkvtoolnix
+    - vorbis-tools
+    - timidity
+    - dvd+rw-tools
+    - lame
+    - twolame
+    - cdrdao
+    - wodim
+    - pulseaudio
+    - bchunk
+
+- name: Install multimedia tools (Ubuntu)
+  when: ansible_distribution == 'Ubuntu'
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - mencoder
+    - dvdrip
+    - ffmpeg
+
+- name: Install multimedia tools (Debian)
+  when: ansible_distribution == 'Debian'
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - libav-tools
+
+- name: Install torrent tools
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - rtorrent
+
+- name: Install communication tools
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - mutt
+    - alpine
+    - fetchmail
+    - spamassassin
+    - tin
+    - irssi
+    - weechat
+    - weechat-plugins
+    - newsbeuter
+
+- name: Install serial tools
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - minicom
+    - curl
+
+- name: Install virtualization tools
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - qemu
+    - qemu-kvm
+    - libvirt-bin
+    - bridge-utils
+
+- name: Install misc. tools
+  apt:
+    name: '{{ item }}'
+    state: present
+    cache_valid_time: 3600
+  with_items:
+    - rdiff
+    - tofrodos
+    - mc
+    - busybox-static
+    - most
+    - bonnie++
+    - time
+    - latencytop
+    - bsdmainutils
+    - dctrl-tools
+    - gddrescue
+    - file
+    - parchive
+    - par2
+    - reportbug
+    - rpm
+    - shtool
+    - stow
+    - xstow
+    - sysstat
+    - unison
+    - john
+    - sg3-utils
+    - dstat
+    - rstat-client
+    - i2c-tools
+    - dnstracer
+    - apt-file
+    - makepasswd
+    - syslinux
+    - fdupes
+    - cowsay
+    - 9base
+    - libjpeg-progs
+    - jq