   (shell-command-on-region (point) (if mark-active (mark) (point)) "pbpaste" nil t)
   (backward-delete-char-untabify 1))
 
-(define-key evil-motion-state-map (kbd "C-y") 'pbcopy)
-(define-key evil-normal-state-map (kbd "C-y") 'pbcopy)
-(define-key evil-normal-state-map (kbd "C-p") 'pbpaste)
+(define-key evil-motion-state-map (kbd "C-y") 'evil-pbcopy)
+(define-key evil-normal-state-map (kbd "C-y") 'evil-pbcopy-line)
+(define-key evil-normal-state-map (kbd "C-p") 'evil-pbpaste)
 
 (provide 'custom-copy)

(evil-define-operator pbcopy (beg end type register)
  :motion evil-line
  :move-point nil
  (interactive "<R><x>")

  (shell-command-on-region beg end "pbcopy")
  (kill-buffer "*Shell Command Output*"))

(defun evil-pbpaste ()
  "Paste data from clipboard"
  (interactive)
  (evil-append-line nil)
